You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-pub@tomee.apache.org by gi...@apache.org on 2024/05/17 00:55:52 UTC

(tomee-site-pub) branch asf-site updated: [site-publish] source tomee-site-generator https://github.com/apache/tomee-site-generator https://ci-builds.apache.org/job/Tomee/job/site-publish

This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/tomee-site-pub.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 67c6310331 [site-publish] source tomee-site-generator https://github.com/apache/tomee-site-generator https://ci-builds.apache.org/job/Tomee/job/site-publish
67c6310331 is described below

commit 67c631033163b850cf484614b30e018ae01c9bc2
Author: jenkins <bu...@apache.org>
AuthorDate: Fri May 17 00:55:42 2024 +0000

    [site-publish] source tomee-site-generator
    https://github.com/apache/tomee-site-generator
    https://ci-builds.apache.org/job/Tomee/job/site-publish
---
 latest/javadoc/allclasses-frame.html               |  10 +-
 latest/javadoc/allclasses-noframe.html             |  10 +-
 latest/javadoc/index-all.html                      |  58 +++++++++-
 .../GlobalListenerSupport.MoniterableHashMap.html  |   4 +-
 .../catalina/HttpServletRequestProxy.Handler.html  |  66 +++++++----
 .../HttpServletRequestProxy.Serialized.html        |  69 +++++++-----
 .../tomee/catalina/HttpServletRequestProxy.html    | 124 ++++++++++----------
 .../tomee/catalina/HttpSessionProxy.Handler.html   |  66 +++++++----
 .../catalina/HttpSessionProxy.Serialized.html      |  69 +++++++-----
 .../apache/tomee/catalina/HttpSessionProxy.html    | 124 ++++++++++----------
 .../tomee/catalina/IgnoredStandardContext.html     |   4 +-
 .../org/apache/tomee/catalina/ServerListener.html  |   4 +-
 .../catalina/ServletContextProxy.Handler.html      |  66 +++++++----
 .../catalina/ServletContextProxy.Serialized.html   |  60 ++++++----
 .../apache/tomee/catalina/ServletContextProxy.html | 125 ++++++++++-----------
 .../tomee/catalina/SimpleTomEETcpCluster.html      |   4 +-
 .../apache/tomee/catalina/TomcatWebAppBuilder.html |  27 +++--
 .../cdi/WebBeansThreadBindingListener.html         |   4 +-
 .../apache/tomee/catalina/cdi/package-frame.html   |   1 -
 .../apache/tomee/catalina/cdi/package-summary.html |   4 -
 .../apache/tomee/catalina/cdi/package-tree.html    |   1 -
 .../org/apache/tomee/catalina/package-frame.html   |   9 ++
 .../org/apache/tomee/catalina/package-summary.html |  36 ++++++
 .../org/apache/tomee/catalina/package-tree.html    |  13 +++
 latest/javadoc/overview-tree.html                  |  10 +-
 latest/javadoc/serialized-form.html                |  63 +++++++++++
 tomee-10.0/javadoc/allclasses-frame.html           |  10 +-
 tomee-10.0/javadoc/allclasses-noframe.html         |  10 +-
 tomee-10.0/javadoc/index-all.html                  |  58 +++++++++-
 .../GlobalListenerSupport.MoniterableHashMap.html  |   4 +-
 ...r.html => HttpServletRequestProxy.Handler.html} |  66 +++++++----
 .../HttpServletRequestProxy.Serialized.html        |  69 +++++++-----
 ...rListener.html => HttpServletRequestProxy.html} | 124 ++++++++++----------
 ...Listener.html => HttpSessionProxy.Handler.html} |  66 +++++++----
 .../catalina/HttpSessionProxy.Serialized.html      |  69 +++++++-----
 .../{ServerListener.html => HttpSessionProxy.html} | 124 ++++++++++----------
 .../tomee/catalina/IgnoredStandardContext.html     |   4 +-
 .../org/apache/tomee/catalina/ServerListener.html  |   4 +-
 ...tener.html => ServletContextProxy.Handler.html} |  66 +++++++----
 ...er.html => ServletContextProxy.Serialized.html} |  60 ++++++----
 .../apache/tomee/catalina/ServletContextProxy.html | 125 ++++++++++-----------
 .../tomee/catalina/SimpleTomEETcpCluster.html      |   4 +-
 .../apache/tomee/catalina/TomcatWebAppBuilder.html |  27 +++--
 .../cdi/WebBeansThreadBindingListener.html         |   4 +-
 .../apache/tomee/catalina/cdi/package-frame.html   |   1 -
 .../apache/tomee/catalina/cdi/package-summary.html |   4 -
 .../apache/tomee/catalina/cdi/package-tree.html    |   1 -
 .../org/apache/tomee/catalina/package-frame.html   |   9 ++
 .../org/apache/tomee/catalina/package-summary.html |  36 ++++++
 .../org/apache/tomee/catalina/package-tree.html    |  13 +++
 tomee-10.0/javadoc/overview-tree.html              |  10 +-
 tomee-10.0/javadoc/serialized-form.html            |  63 +++++++++++
 tomee-8.0/javadoc/allclasses-frame.html            |  10 +-
 tomee-8.0/javadoc/allclasses-noframe.html          |  10 +-
 tomee-8.0/javadoc/index-all.html                   |  58 +++++++++-
 .../GlobalListenerSupport.MoniterableHashMap.html  |   4 +-
 .../catalina/HttpServletRequestProxy.Handler.html  |  66 +++++++----
 ...tml => HttpServletRequestProxy.Serialized.html} |  69 +++++++-----
 .../tomee/catalina/HttpServletRequestProxy.html    | 124 ++++++++++----------
 .../tomee/catalina/HttpSessionProxy.Handler.html   |  66 +++++++----
 ...uster.html => HttpSessionProxy.Serialized.html} |  69 +++++++-----
 .../apache/tomee/catalina/HttpSessionProxy.html    | 124 ++++++++++----------
 .../tomee/catalina/IgnoredStandardContext.html     |   4 +-
 .../org/apache/tomee/catalina/ServerListener.html  |   4 +-
 .../catalina/ServletContextProxy.Handler.html      |  66 +++++++----
 .../catalina/ServletContextProxy.Serialized.html   |  60 ++++++----
 ...mEETcpCluster.html => ServletContextProxy.html} | 125 ++++++++++-----------
 .../tomee/catalina/SimpleTomEETcpCluster.html      |   4 +-
 .../apache/tomee/catalina/TomcatWebAppBuilder.html |  27 +++--
 .../cdi/WebBeansThreadBindingListener.html         |   4 +-
 .../apache/tomee/catalina/cdi/package-frame.html   |   1 -
 .../apache/tomee/catalina/cdi/package-summary.html |   4 -
 .../apache/tomee/catalina/cdi/package-tree.html    |   1 -
 .../org/apache/tomee/catalina/package-frame.html   |   9 ++
 .../org/apache/tomee/catalina/package-summary.html |  36 ++++++
 .../org/apache/tomee/catalina/package-tree.html    |  13 +++
 tomee-8.0/javadoc/overview-tree.html               |  10 +-
 tomee-8.0/javadoc/serialized-form.html             |  63 +++++++++++
 tomee-9.0/javadoc/allclasses-frame.html            |  10 +-
 tomee-9.0/javadoc/allclasses-noframe.html          |  10 +-
 tomee-9.0/javadoc/index-all.html                   |  58 +++++++++-
 .../GlobalListenerSupport.MoniterableHashMap.html  |   4 +-
 .../catalina/HttpServletRequestProxy.Handler.html  |  66 +++++++----
 .../HttpServletRequestProxy.Serialized.html        |  69 +++++++-----
 .../tomee/catalina/HttpServletRequestProxy.html    | 124 ++++++++++----------
 .../tomee/catalina/HttpSessionProxy.Handler.html   |  66 +++++++----
 .../catalina/HttpSessionProxy.Serialized.html      |  69 +++++++-----
 .../apache/tomee/catalina/HttpSessionProxy.html    | 124 ++++++++++----------
 .../tomee/catalina/IgnoredStandardContext.html     |   4 +-
 .../org/apache/tomee/catalina/ServerListener.html  |   4 +-
 .../catalina/ServletContextProxy.Handler.html      |  66 +++++++----
 .../catalina/ServletContextProxy.Serialized.html   |  60 ++++++----
 .../apache/tomee/catalina/ServletContextProxy.html | 125 ++++++++++-----------
 .../tomee/catalina/SimpleTomEETcpCluster.html      |   4 +-
 .../apache/tomee/catalina/TomcatWebAppBuilder.html |  27 +++--
 .../cdi/WebBeansThreadBindingListener.html         |   4 +-
 .../apache/tomee/catalina/cdi/package-frame.html   |   1 -
 .../apache/tomee/catalina/cdi/package-summary.html |   4 -
 .../apache/tomee/catalina/cdi/package-tree.html    |   1 -
 .../org/apache/tomee/catalina/package-frame.html   |   9 ++
 .../org/apache/tomee/catalina/package-summary.html |  36 ++++++
 .../org/apache/tomee/catalina/package-tree.html    |  13 +++
 tomee-9.0/javadoc/overview-tree.html               |  10 +-
 tomee-9.0/javadoc/serialized-form.html             |  63 +++++++++++
 104 files changed, 2636 insertions(+), 1488 deletions(-)

diff --git a/latest/javadoc/allclasses-frame.html b/latest/javadoc/allclasses-frame.html
index 6a84b944ff..d01a158887 100644
--- a/latest/javadoc/allclasses-frame.html
+++ b/latest/javadoc/allclasses-frame.html
@@ -1388,8 +1388,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util" target="classFrame">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee" target="classFrame">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Icon$JAXB</a></li>
@@ -2889,7 +2895,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic" target="classFrame">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletListener</a></li>
diff --git a/latest/javadoc/allclasses-noframe.html b/latest/javadoc/allclasses-noframe.html
index f5935c2e01..cbfc1bd31d 100644
--- a/latest/javadoc/allclasses-noframe.html
+++ b/latest/javadoc/allclasses-noframe.html
@@ -1388,8 +1388,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee">Icon$JAXB</a></li>
@@ -2889,7 +2895,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd">ServletListener</a></li>
diff --git a/latest/javadoc/index-all.html b/latest/javadoc/index-all.html
index 61b8ae58c7..212ba92cd9 100644
--- a/latest/javadoc/index-all.html
+++ b/latest/javadoc/index-all.html
@@ -7380,6 +7380,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/Contexts.html#Contexts--">Contexts()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/Contexts.html" title="class in org.apache.tomee.catalina">Contexts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span> - Static variable in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/threads/impl/ContextServiceImpl.html" title="class in org.apache.openejb.threads.impl"><span class="typeNameLink">ContextServiceImpl</span></a> - Class in <a href="org/apache/openejb/threads/impl/package-summary.html">org.apache.openejb.threads.impl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/threads/impl/ContextServiceImpl.html#ContextServiceImpl--">ContextServiceImpl()</a></span> - Constructor for class org.apache.openejb.threads.impl.<a href="org/apache/openejb/threads/impl/ContextServiceImpl.html" title="class in org.apache.openejb.threads.impl">ContextServiceImpl</a></dt>
@@ -19910,6 +19912,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/environment/Hosts.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.tomee.catalina.environment.<a href="org/apache/tomee/catalina/environment/Hosts.html" title="class in org.apache.tomee.catalina.environment">Hosts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html#get--">get()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder.StandardContextInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomEEContainerListener.html#get--">get()</a></span> - Static method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomEEContainerListener.html" title="class in org.apache.tomee.catalina">TomEEContainerListener</a></dt>
@@ -23453,8 +23461,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html#getContextRoot--">getContextRoot()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina">TomcatDeploymentLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#getContexts--">getContexts()</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.html#getContextService--">getContextService()</a></span> - Method in class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/loader/TomcatHelper.html#getContextState-StandardContext-">getContextState(StandardContext)</a></span> - Static method in class org.apache.tomee.loader.<a href="org/apache/tomee/loader/TomcatHelper.html" title="class in org.apache.tomee.loader">TomcatHelper</a></dt>
@@ -42195,6 +42201,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/urlhandler/resource/Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.openejb.util.urlhandler.resource.<a href="org/apache/openejb/util/urlhandler/resource/Handler.html" title="class in org.apache.openejb.util.urlhandler.resource">Handler</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Handler$JAXB</span></a> - Class in <a href="org/apache/openejb/jee/package-summary.html">org.apache.openejb.jee</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Handler$JAXB.html#Handler:DJAXB--">Handler$JAXB()</a></span> - Constructor for class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee">Handler$JAXB</a></dt>
@@ -43043,6 +43055,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html#HttpServletRequestBean-WebBeansContext-">HttpServletRequestBean(WebBeansContext)</a></span> - Constructor for class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle.HttpServletRequestBean</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/SunWebApp.html#httpservletSecurityProvider">httpservletSecurityProvider</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/SunWebApp.html" title="class in org.apache.openejb.jee.sun">SunWebApp</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSession</span></a> - Interface in <a href="org/apache/openejb/server/httpd/package-summary.html">org.apache.openejb.server.httpd</a></dt>
@@ -43053,6 +43071,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html#HttpSessionImpl--">HttpSessionImpl()</a></span> - Constructor for class org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.arquillian.common.<a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html" title="class in org.apache.openejb.arquillian.common">TomEEConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.maven.plugins.<a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html" title="class in org.apache.openejb.maven.plugins">TomEEEmbeddedMojo</a></dt>
@@ -45905,7 +45929,9 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/web/WebInitialContext.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.openejb.web.<a href="org/apache/openejb/web/WebInitialContext.html" title="class in org.apache.openejb.web">WebInitialContext</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina">OpenEJBSecurityListener.RequestCapturer</a></dt>
 <dd>&nbsp;</dd>
@@ -45913,6 +45939,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/routing/RouterValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.routing.<a href="org/apache/tomee/catalina/routing/RouterValve.html" title="class in org.apache.tomee.catalina.routing">RouterValve</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/valve/LazyValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.valve.<a href="org/apache/tomee/catalina/valve/LazyValve.html" title="class in org.apache.tomee.catalina.valve">LazyValve</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html#invoke-InvocationContext-">invoke(InvocationContext)</a></span> - Method in class org.apache.tomee.microprofile.jwt.bval.<a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html" title="class in org.apache.tomee.microprofile.jwt.bval">BValInterceptor</a></dt>
@@ -60234,6 +60262,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/PojoSerialization.html#readResolve--">readResolve()</a></span> - Method in class org.apache.openejb.util.<a href="org/apache/openejb/util/PojoSerialization.html" title="class in org.apache.openejb.util">PojoSerialization</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#readResourceAdapter-XoXMLStreamReader-RuntimeContext-">readResourceAdapter(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html#readResourceEnvRef-XoXMLStreamReader-RuntimeContext-">readResourceEnvRef(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html" title="class in org.apache.openejb.jee">ResourceEnvRef$JAXB</a></dt>
@@ -63728,6 +63762,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/wls/Compatibility.html#serializeCharArrayToBytes">serializeCharArrayToBytes</a></span> - Variable in class org.apache.openejb.jee.wls.<a href="org/apache/openejb/jee/wls/Compatibility.html" title="class in org.apache.openejb.jee.wls">Compatibility</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/client/JNDIContext.html#SERIALIZER">SERIALIZER</a></span> - Static variable in class org.apache.openejb.client.<a href="org/apache/openejb/client/JNDIContext.html" title="class in org.apache.openejb.client">JNDIContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/spi/Serializer.html" title="class in org.apache.openejb.spi"><span class="typeNameLink">Serializer</span></a> - Class in <a href="org/apache/openejb/spi/package-summary.html">org.apache.openejb.spi</a></dt>
@@ -64491,9 +64531,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Servlet.html#servletClass">servletClass</a></span> - Variable in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee">Servlet</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> - Class in <a href="org/apache/tomee/catalina/cdi/package-summary.html">org.apache.tomee.catalina.cdi</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#ServletContextHandler--">ServletContextHandler()</a></span> - Constructor for class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html#servletImplClass">servletImplClass</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html" title="class in org.apache.openejb.jee.sun">WebserviceEndpoint</a></dt>
 <dd>&nbsp;</dd>
@@ -87568,6 +87610,12 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/persistence/JtaEntityManager.html#writeReplace--">writeReplace()</a></span> - Method in class org.apache.openejb.persistence.<a href="org/apache/openejb/persistence/JtaEntityManager.html" title="class in org.apache.openejb.persistence">JtaEntityManager</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html#writeRequiredConfigProperty-XoXMLStreamWriter-org.apache.openejb.jee.RequiredConfigProperty-RuntimeContext-">writeRequiredConfigProperty(XoXMLStreamWriter, RequiredConfigProperty, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html" title="class in org.apache.openejb.jee">RequiredConfigProperty$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#writeResourceAdapter-XoXMLStreamWriter-org.apache.openejb.jee.ResourceAdapter-RuntimeContext-">writeResourceAdapter(XoXMLStreamWriter, ResourceAdapter, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
diff --git a/latest/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html b/latest/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
index 581e9f2cfd..93ebf3e2a6 100644
--- a/latest/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
+++ b/latest/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
@@ -328,7 +328,7 @@ extends java.util.LinkedHashMap&lt;java.lang.Object,java.lang.Object&gt;</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
similarity index 69%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
index fa726ab976..afd715c6a6 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpServletRequestProxy.Handler" class="title">Class HttpServletRequestProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
similarity index 71%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
index c2db50a95b..0735ee8129 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpServletRequestProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpServletRequestProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpServletRequestProxy.Serialized" class="title">Class HttpServletRequestProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
index fa726ab976..0b8dd2e6ab 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpServletRequestProxy" class="title">Interface HttpServletRequestProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpServletRequestProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpServletRequest</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpServletRequest&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
similarity index 70%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
index fa726ab976..f196a9a28e 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpSessionProxy.Handler" class="title">Class HttpSessionProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
similarity index 73%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
index c2db50a95b..8dfbfcf3ac 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpSessionProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpSessionProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpSessionProxy.Serialized" class="title">Class HttpSessionProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpSessionProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
index fa726ab976..b2c41704fe 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpSessionProxy" class="title">Interface HttpSessionProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpSessionProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpSession</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpSession&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/latest/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html b/latest/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
index 143245e032..d19035be04 100644
--- a/latest/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
+++ b/latest/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -199,7 +199,7 @@ extends StandardContext</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/latest/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/ServerListener.html
index fa726ab976..69543c6ab5 100644
--- a/latest/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/ServerListener.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
@@ -225,7 +225,7 @@ extends java.lang.Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
similarity index 71%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
index fa726ab976..cc49ce8fcd 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Handler" class="title">Class ServletContextProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
similarity index 77%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
index fa726ab976..4f984ee603 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Serialized" class="title">Class ServletContextProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.ServletContextProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -128,7 +141,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +159,8 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +184,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +201,18 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +242,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
similarity index 58%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
index c2db50a95b..6a1c98006c 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/latest/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>ServletContextProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="ServletContextProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -49,11 +49,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,48 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Interface ServletContextProxy" class="title">Interface ServletContextProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public interface <span class="typeNameLabel">ServletContextProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -145,23 +142,20 @@ extends SimpleTcpCluster</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static ServletContext</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -170,36 +164,33 @@ extends SimpleTcpCluster</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
-</li>
-</ul>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>get</h4>
+<pre>static&nbsp;ServletContext&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -230,11 +221,11 @@ extends SimpleTcpCluster</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -254,15 +245,15 @@ extends SimpleTcpCluster</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/latest/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/latest/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
index c2db50a95b..72fd497a55 100644
--- a/latest/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/latest/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -229,7 +229,7 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/latest/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html b/latest/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
index d5e071119b..ceee3faecb 100644
--- a/latest/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
+++ b/latest/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
@@ -165,32 +165,36 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#DEFAULT_J2EE_SERVER">DEFAULT_J2EE_SERVER</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#IGNORE_CONTEXT">IGNORE_CONTEXT</a></span></code>
 <div class="block">Flag for ignore context</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_CROSSCONTEXT_PROPERTY">OPENEJB_CROSSCONTEXT_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_JSESSION_ID_SUPPORT">OPENEJB_JSESSION_ID_SUPPORT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES">OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_SESSION_MANAGER_PROPERTY">OPENEJB_SESSION_MANAGER_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_WEBAPP_MODULE_ID">OPENEJB_WEBAPP_MODULE_ID</a></span></code>&nbsp;</td>
 </tr>
@@ -494,7 +498,7 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <a name="OPENEJB_WEBAPP_MODULE_ID">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>OPENEJB_WEBAPP_MODULE_ID</h4>
 <pre>public static final&nbsp;java.lang.String OPENEJB_WEBAPP_MODULE_ID</pre>
@@ -504,6 +508,15 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 </dl>
 </li>
 </ul>
+<a name="CONTEXTS">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CONTEXTS</h4>
+<pre>public static final&nbsp;java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt; CONTEXTS</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
diff --git a/latest/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html b/latest/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
index a49451feaf..77f2221cd1 100644
--- a/latest/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
+++ b/latest/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -248,7 +248,7 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/latest/javadoc/org/apache/tomee/catalina/cdi/package-frame.html b/latest/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
index 1440050403..8f7b59dc7a 100644
--- a/latest/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
+++ b/latest/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
@@ -13,7 +13,6 @@
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
 <li><a href="WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">WebBeansThreadBindingListener</a></li>
 </ul>
 </div>
diff --git a/latest/javadoc/org/apache/tomee/catalina/cdi/package-summary.html b/latest/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
index 357e4c0878..ffea68b30a 100644
--- a/latest/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
+++ b/latest/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
@@ -82,10 +82,6 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi">WebBeansThreadBindingListener</a></td>
 <td class="colLast">
 <div class="block">For Tomcat we need to implement a ThreadBindingListener to
diff --git a/latest/javadoc/org/apache/tomee/catalina/cdi/package-tree.html b/latest/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
index e909d55453..137211c2b5 100644
--- a/latest/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
+++ b/latest/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
@@ -80,7 +80,6 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
 <li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">WebBeansThreadBindingListener</span></a></li>
 </ul>
 </li>
diff --git a/latest/javadoc/org/apache/tomee/catalina/package-frame.html b/latest/javadoc/org/apache/tomee/catalina/package-frame.html
index 84e4afc657..91b9ab34c2 100644
--- a/latest/javadoc/org/apache/tomee/catalina/package-frame.html
+++ b/latest/javadoc/org/apache/tomee/catalina/package-frame.html
@@ -14,6 +14,9 @@
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
 <li><a href="ContextListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ContextListener</span></a></li>
+<li><a href="HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
 <li><a href="WebDeploymentListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">WebDeploymentListener</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
@@ -22,6 +25,10 @@
 <li><a href="ContextValue.html" title="class in org.apache.tomee.catalina" target="classFrame">ContextValue</a></li>
 <li><a href="GlobalListenerSupport.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport</a></li>
 <li><a href="GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport.MoniterableHashMap</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
+<li><a href="HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="IgnoredStandardContext.html" title="class in org.apache.tomee.catalina" target="classFrame">IgnoredStandardContext</a></li>
 <li><a href="JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina" target="classFrame">JavaeeInstanceManager</a></li>
 <li><a href="LazyStopLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">LazyStopLoader</a></li>
@@ -35,6 +42,8 @@
 <li><a href="OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBSecurityListener.RequestCapturer</a></li>
 <li><a href="OpenEJBValve.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBValve</a></li>
 <li><a href="ServerListener.html" title="class in org.apache.tomee.catalina" target="classFrame">ServerListener</a></li>
+<li><a href="ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina" target="classFrame">SimpleTomEETcpCluster</a></li>
 <li><a href="TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatDeploymentLoader</a></li>
 <li><a href="TomcatJavaJndiBinder.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatJavaJndiBinder</a></li>
diff --git a/latest/javadoc/org/apache/tomee/catalina/package-summary.html b/latest/javadoc/org/apache/tomee/catalina/package-summary.html
index 9f8df99702..cc7e0a8b47 100644
--- a/latest/javadoc/org/apache/tomee/catalina/package-summary.html
+++ b/latest/javadoc/org/apache/tomee/catalina/package-summary.html
@@ -88,6 +88,18 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina">WebDeploymentListener</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -122,6 +134,22 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina">IgnoredStandardContext</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -177,6 +205,14 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina">SimpleTomEETcpCluster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/latest/javadoc/org/apache/tomee/catalina/package-tree.html b/latest/javadoc/org/apache/tomee/catalina/package-tree.html
index a7e1e890e1..240a45411a 100644
--- a/latest/javadoc/org/apache/tomee/catalina/package-tree.html
+++ b/latest/javadoc/org/apache/tomee/catalina/package-tree.html
@@ -110,6 +110,10 @@
 </ul>
 </li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">GlobalListenerSupport</span></a> (implements java.beans.PropertyChangeListener)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">JavaeeInstanceManager</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopLoader</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopStandardRoot.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopStandardRoot</span></a></li>
@@ -151,6 +155,8 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">SimpleTcpCluster
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">SimpleTomEETcpCluster</span></a></li>
@@ -215,6 +221,13 @@
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ContextListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ContextListener</span></a></li>
+<li type="circle">java.io.Serializable
+<ul>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">WebDeploymentListener</span></a></li>
 </ul>
 </div>
diff --git a/latest/javadoc/overview-tree.html b/latest/javadoc/overview-tree.html
index 3ce5268b29..10e80807df 100644
--- a/latest/javadoc/overview-tree.html
+++ b/latest/javadoc/overview-tree.html
@@ -2554,6 +2554,8 @@
 <li type="circle">org.apache.tomee.loader.<a href="org/apache/tomee/loader/LoaderServlet.html" title="class in org.apache.tomee.loader"><span class="typeNameLink">LoaderServlet</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">HttpServletRequestWrapper
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/EEFilter.NoCdiRequest.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">EEFilter.NoCdiRequest</span></a>
@@ -2579,6 +2581,8 @@
 </ul>
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSessionImpl</span></a> (implements org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd">HttpSession</a>)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.openejb.server.httpd.util.<a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util"><span class="typeNameLink">HttpUtil</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Icon</span></a> (implements org.apache.openejb.jee.<a href="org/apache/openejb/jee/Keyable.html" title="interface in org.apache.openejb.jee">Keyable</a>&lt;K&gt;)</li>
 <li type="circle">org.apache.openejb.jee.was.v6.common.<a href="org/apache/openejb/jee/was/v6/common/IconType.html" title="class in org.apache.openejb.jee.was.v6.common"><span class="typeNameLink">IconType</span></a></li>
@@ -4118,7 +4122,8 @@
 <li type="circle">org.apache.openejb.config.<a href="org/apache/openejb/config/ServiceUtils.ProviderInfo.html" title="class in org.apache.openejb.config"><span class="typeNameLink">ServiceUtils.ProviderInfo</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Servlet</span></a></li>
 <li type="circle">org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/Servlet.html" title="class in org.apache.openejb.jee.sun"><span class="typeNameLink">Servlet</span></a></li>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">ServletInputStream
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">ServletByteArrayIntputStream</span></a></li>
@@ -5269,7 +5274,10 @@
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpRequest.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpRequest</span></a></li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpResponse.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpResponse</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
 <li type="circle">org.apache.openejb.core.ivm.<a href="org/apache/openejb/core/ivm/IntraVmProxy.html" title="interface in org.apache.openejb.core.ivm"><span class="typeNameLink">IntraVmProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.openejb.spi.<a href="org/apache/openejb/spi/Service.html" title="interface in org.apache.openejb.spi"><span class="typeNameLink">Service</span></a>
diff --git a/latest/javadoc/serialized-form.html b/latest/javadoc/serialized-form.html
index e5395b21bc..6690c3f24b 100644
--- a/latest/javadoc/serialized-form.html
+++ b/latest/javadoc/serialized-form.html
@@ -9074,11 +9074,74 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpSessionProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpSessionProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.InjectionFailedException">
 <!--   -->
 </a>
 <h3>Class <a href="org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.InjectionFailedException</a> extends java.lang.IllegalStateException implements Serializable</h3>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.ServletContextProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.ServletContextProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.TomEERuntimeException">
 <!--   -->
 </a>
diff --git a/tomee-10.0/javadoc/allclasses-frame.html b/tomee-10.0/javadoc/allclasses-frame.html
index 5438ea28d7..8174e90eb4 100644
--- a/tomee-10.0/javadoc/allclasses-frame.html
+++ b/tomee-10.0/javadoc/allclasses-frame.html
@@ -1388,8 +1388,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util" target="classFrame">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee" target="classFrame">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Icon$JAXB</a></li>
@@ -2867,7 +2873,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic" target="classFrame">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletListener</a></li>
diff --git a/tomee-10.0/javadoc/allclasses-noframe.html b/tomee-10.0/javadoc/allclasses-noframe.html
index 9dce352659..c3bc88757a 100644
--- a/tomee-10.0/javadoc/allclasses-noframe.html
+++ b/tomee-10.0/javadoc/allclasses-noframe.html
@@ -1388,8 +1388,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee">Icon$JAXB</a></li>
@@ -2867,7 +2873,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd">ServletListener</a></li>
diff --git a/tomee-10.0/javadoc/index-all.html b/tomee-10.0/javadoc/index-all.html
index 58ddff0fd5..118fa447c7 100644
--- a/tomee-10.0/javadoc/index-all.html
+++ b/tomee-10.0/javadoc/index-all.html
@@ -7356,6 +7356,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/Contexts.html#Contexts--">Contexts()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/Contexts.html" title="class in org.apache.tomee.catalina">Contexts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span> - Static variable in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Application.html#contextService">contextService</a></span> - Variable in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Application.html" title="class in org.apache.openejb.jee">Application</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/jee/ContextService.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">ContextService</span></a> - Class in <a href="org/apache/openejb/jee/package-summary.html">org.apache.openejb.jee</a></dt>
@@ -19844,6 +19846,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/environment/Hosts.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.tomee.catalina.environment.<a href="org/apache/tomee/catalina/environment/Hosts.html" title="class in org.apache.tomee.catalina.environment">Hosts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html#get--">get()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder.StandardContextInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomEEContainerListener.html#get--">get()</a></span> - Static method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomEEContainerListener.html" title="class in org.apache.tomee.catalina">TomEEContainerListener</a></dt>
@@ -23395,8 +23403,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html#getContextRoot--">getContextRoot()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina">TomcatDeploymentLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#getContexts--">getContexts()</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.html#getContextService--">getContextService()</a></span> - Method in class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.html#getContextService--">getContextService()</a></span> - Method in class org.apache.openejb.threads.impl.<a href="org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.html" title="class in org.apache.openejb.threads.impl">ManagedExecutorServiceImpl</a></dt>
@@ -42188,6 +42194,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/urlhandler/resource/Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.openejb.util.urlhandler.resource.<a href="org/apache/openejb/util/urlhandler/resource/Handler.html" title="class in org.apache.openejb.util.urlhandler.resource">Handler</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Handler$JAXB</span></a> - Class in <a href="org/apache/openejb/jee/package-summary.html">org.apache.openejb.jee</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Handler$JAXB.html#Handler:DJAXB--">Handler$JAXB()</a></span> - Constructor for class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee">Handler$JAXB</a></dt>
@@ -43036,6 +43048,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html#HttpServletRequestBean-WebBeansContext-">HttpServletRequestBean(WebBeansContext)</a></span> - Constructor for class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle.HttpServletRequestBean</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/SunWebApp.html#httpservletSecurityProvider">httpservletSecurityProvider</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/SunWebApp.html" title="class in org.apache.openejb.jee.sun">SunWebApp</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSession</span></a> - Interface in <a href="org/apache/openejb/server/httpd/package-summary.html">org.apache.openejb.server.httpd</a></dt>
@@ -43046,6 +43064,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html#HttpSessionImpl--">HttpSessionImpl()</a></span> - Constructor for class org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.arquillian.common.<a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html" title="class in org.apache.openejb.arquillian.common">TomEEConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.maven.plugins.<a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html" title="class in org.apache.openejb.maven.plugins">TomEEEmbeddedMojo</a></dt>
@@ -45898,7 +45922,9 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/web/WebInitialContext.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.openejb.web.<a href="org/apache/openejb/web/WebInitialContext.html" title="class in org.apache.openejb.web">WebInitialContext</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina">OpenEJBSecurityListener.RequestCapturer</a></dt>
 <dd>&nbsp;</dd>
@@ -45906,6 +45932,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/routing/RouterValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.routing.<a href="org/apache/tomee/catalina/routing/RouterValve.html" title="class in org.apache.tomee.catalina.routing">RouterValve</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/valve/LazyValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.valve.<a href="org/apache/tomee/catalina/valve/LazyValve.html" title="class in org.apache.tomee.catalina.valve">LazyValve</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html#invoke-InvocationContext-">invoke(InvocationContext)</a></span> - Method in class org.apache.tomee.microprofile.jwt.bval.<a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html" title="class in org.apache.tomee.microprofile.jwt.bval">BValInterceptor</a></dt>
@@ -60038,6 +60066,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/PojoSerialization.html#readResolve--">readResolve()</a></span> - Method in class org.apache.openejb.util.<a href="org/apache/openejb/util/PojoSerialization.html" title="class in org.apache.openejb.util">PojoSerialization</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#readResourceAdapter-XoXMLStreamReader-RuntimeContext-">readResourceAdapter(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html#readResourceEnvRef-XoXMLStreamReader-RuntimeContext-">readResourceEnvRef(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html" title="class in org.apache.openejb.jee">ResourceEnvRef$JAXB</a></dt>
@@ -63510,6 +63544,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/wls/Compatibility.html#serializeCharArrayToBytes">serializeCharArrayToBytes</a></span> - Variable in class org.apache.openejb.jee.wls.<a href="org/apache/openejb/jee/wls/Compatibility.html" title="class in org.apache.openejb.jee.wls">Compatibility</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/client/JNDIContext.html#SERIALIZER">SERIALIZER</a></span> - Static variable in class org.apache.openejb.client.<a href="org/apache/openejb/client/JNDIContext.html" title="class in org.apache.openejb.client">JNDIContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/spi/Serializer.html" title="class in org.apache.openejb.spi"><span class="typeNameLink">Serializer</span></a> - Class in <a href="org/apache/openejb/spi/package-summary.html">org.apache.openejb.spi</a></dt>
@@ -64273,9 +64313,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Servlet.html#servletClass">servletClass</a></span> - Variable in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee">Servlet</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> - Class in <a href="org/apache/tomee/catalina/cdi/package-summary.html">org.apache.tomee.catalina.cdi</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#ServletContextHandler--">ServletContextHandler()</a></span> - Constructor for class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html#servletImplClass">servletImplClass</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html" title="class in org.apache.openejb.jee.sun">WebserviceEndpoint</a></dt>
 <dd>&nbsp;</dd>
@@ -87348,6 +87390,12 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/persistence/JtaEntityManager.html#writeReplace--">writeReplace()</a></span> - Method in class org.apache.openejb.persistence.<a href="org/apache/openejb/persistence/JtaEntityManager.html" title="class in org.apache.openejb.persistence">JtaEntityManager</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html#writeRequiredConfigProperty-XoXMLStreamWriter-org.apache.openejb.jee.RequiredConfigProperty-RuntimeContext-">writeRequiredConfigProperty(XoXMLStreamWriter, RequiredConfigProperty, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html" title="class in org.apache.openejb.jee">RequiredConfigProperty$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#writeResourceAdapter-XoXMLStreamWriter-org.apache.openejb.jee.ResourceAdapter-RuntimeContext-">writeResourceAdapter(XoXMLStreamWriter, ResourceAdapter, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
index 581e9f2cfd..93ebf3e2a6 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
@@ -328,7 +328,7 @@ extends java.util.LinkedHashMap&lt;java.lang.Object,java.lang.Object&gt;</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
similarity index 69%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
index fa726ab976..afd715c6a6 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpServletRequestProxy.Handler" class="title">Class HttpServletRequestProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
similarity index 71%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
index c2db50a95b..0735ee8129 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpServletRequestProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpServletRequestProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpServletRequestProxy.Serialized" class="title">Class HttpServletRequestProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
index fa726ab976..0b8dd2e6ab 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpServletRequestProxy" class="title">Interface HttpServletRequestProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpServletRequestProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpServletRequest</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpServletRequest&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
similarity index 70%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
index fa726ab976..f196a9a28e 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpSessionProxy.Handler" class="title">Class HttpSessionProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
similarity index 73%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
index c2db50a95b..8dfbfcf3ac 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpSessionProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpSessionProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpSessionProxy.Serialized" class="title">Class HttpSessionProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpSessionProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
index fa726ab976..b2c41704fe 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpSessionProxy" class="title">Interface HttpSessionProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpSessionProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpSession</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpSession&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
index 143245e032..d19035be04 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -199,7 +199,7 @@ extends StandardContext</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
index fa726ab976..69543c6ab5 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
@@ -225,7 +225,7 @@ extends java.lang.Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
similarity index 71%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
index fa726ab976..cc49ce8fcd 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Handler" class="title">Class ServletContextProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
similarity index 77%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
index fa726ab976..4f984ee603 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Serialized" class="title">Class ServletContextProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.ServletContextProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -128,7 +141,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +159,8 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +184,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +201,18 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +242,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
similarity index 58%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
index c2db50a95b..6a1c98006c 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>ServletContextProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="ServletContextProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -49,11 +49,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,48 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Interface ServletContextProxy" class="title">Interface ServletContextProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public interface <span class="typeNameLabel">ServletContextProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -145,23 +142,20 @@ extends SimpleTcpCluster</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static ServletContext</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -170,36 +164,33 @@ extends SimpleTcpCluster</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
-</li>
-</ul>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>get</h4>
+<pre>static&nbsp;ServletContext&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -230,11 +221,11 @@ extends SimpleTcpCluster</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -254,15 +245,15 @@ extends SimpleTcpCluster</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
index c2db50a95b..72fd497a55 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -229,7 +229,7 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
index d5e071119b..ceee3faecb 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
@@ -165,32 +165,36 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#DEFAULT_J2EE_SERVER">DEFAULT_J2EE_SERVER</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#IGNORE_CONTEXT">IGNORE_CONTEXT</a></span></code>
 <div class="block">Flag for ignore context</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_CROSSCONTEXT_PROPERTY">OPENEJB_CROSSCONTEXT_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_JSESSION_ID_SUPPORT">OPENEJB_JSESSION_ID_SUPPORT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES">OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_SESSION_MANAGER_PROPERTY">OPENEJB_SESSION_MANAGER_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_WEBAPP_MODULE_ID">OPENEJB_WEBAPP_MODULE_ID</a></span></code>&nbsp;</td>
 </tr>
@@ -494,7 +498,7 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <a name="OPENEJB_WEBAPP_MODULE_ID">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>OPENEJB_WEBAPP_MODULE_ID</h4>
 <pre>public static final&nbsp;java.lang.String OPENEJB_WEBAPP_MODULE_ID</pre>
@@ -504,6 +508,15 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 </dl>
 </li>
 </ul>
+<a name="CONTEXTS">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CONTEXTS</h4>
+<pre>public static final&nbsp;java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt; CONTEXTS</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
index a49451feaf..77f2221cd1 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -248,7 +248,7 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
index 1440050403..8f7b59dc7a 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
@@ -13,7 +13,6 @@
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
 <li><a href="WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">WebBeansThreadBindingListener</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
index 357e4c0878..ffea68b30a 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
@@ -82,10 +82,6 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi">WebBeansThreadBindingListener</a></td>
 <td class="colLast">
 <div class="block">For Tomcat we need to implement a ThreadBindingListener to
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
index e909d55453..137211c2b5 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
@@ -80,7 +80,6 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
 <li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">WebBeansThreadBindingListener</span></a></li>
 </ul>
 </li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/package-frame.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/package-frame.html
index 84e4afc657..91b9ab34c2 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/package-frame.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/package-frame.html
@@ -14,6 +14,9 @@
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
 <li><a href="ContextListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ContextListener</span></a></li>
+<li><a href="HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
 <li><a href="WebDeploymentListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">WebDeploymentListener</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
@@ -22,6 +25,10 @@
 <li><a href="ContextValue.html" title="class in org.apache.tomee.catalina" target="classFrame">ContextValue</a></li>
 <li><a href="GlobalListenerSupport.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport</a></li>
 <li><a href="GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport.MoniterableHashMap</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
+<li><a href="HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="IgnoredStandardContext.html" title="class in org.apache.tomee.catalina" target="classFrame">IgnoredStandardContext</a></li>
 <li><a href="JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina" target="classFrame">JavaeeInstanceManager</a></li>
 <li><a href="LazyStopLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">LazyStopLoader</a></li>
@@ -35,6 +42,8 @@
 <li><a href="OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBSecurityListener.RequestCapturer</a></li>
 <li><a href="OpenEJBValve.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBValve</a></li>
 <li><a href="ServerListener.html" title="class in org.apache.tomee.catalina" target="classFrame">ServerListener</a></li>
+<li><a href="ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina" target="classFrame">SimpleTomEETcpCluster</a></li>
 <li><a href="TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatDeploymentLoader</a></li>
 <li><a href="TomcatJavaJndiBinder.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatJavaJndiBinder</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/package-summary.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/package-summary.html
index 9f8df99702..cc7e0a8b47 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/package-summary.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/package-summary.html
@@ -88,6 +88,18 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina">WebDeploymentListener</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -122,6 +134,22 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina">IgnoredStandardContext</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -177,6 +205,14 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina">SimpleTomEETcpCluster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/package-tree.html b/tomee-10.0/javadoc/org/apache/tomee/catalina/package-tree.html
index a7e1e890e1..240a45411a 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/package-tree.html
+++ b/tomee-10.0/javadoc/org/apache/tomee/catalina/package-tree.html
@@ -110,6 +110,10 @@
 </ul>
 </li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">GlobalListenerSupport</span></a> (implements java.beans.PropertyChangeListener)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">JavaeeInstanceManager</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopLoader</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopStandardRoot.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopStandardRoot</span></a></li>
@@ -151,6 +155,8 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">SimpleTcpCluster
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">SimpleTomEETcpCluster</span></a></li>
@@ -215,6 +221,13 @@
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ContextListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ContextListener</span></a></li>
+<li type="circle">java.io.Serializable
+<ul>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">WebDeploymentListener</span></a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/overview-tree.html b/tomee-10.0/javadoc/overview-tree.html
index 01408fadfb..884df58d60 100644
--- a/tomee-10.0/javadoc/overview-tree.html
+++ b/tomee-10.0/javadoc/overview-tree.html
@@ -2542,6 +2542,8 @@
 <li type="circle">org.apache.tomee.loader.<a href="org/apache/tomee/loader/LoaderServlet.html" title="class in org.apache.tomee.loader"><span class="typeNameLink">LoaderServlet</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">HttpServletRequestWrapper
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/EEFilter.NoCdiRequest.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">EEFilter.NoCdiRequest</span></a>
@@ -2567,6 +2569,8 @@
 </ul>
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSessionImpl</span></a> (implements org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd">HttpSession</a>)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.openejb.server.httpd.util.<a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util"><span class="typeNameLink">HttpUtil</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Icon</span></a> (implements org.apache.openejb.jee.<a href="org/apache/openejb/jee/Keyable.html" title="interface in org.apache.openejb.jee">Keyable</a>&lt;K&gt;)</li>
 <li type="circle">org.apache.openejb.jee.was.v6.common.<a href="org/apache/openejb/jee/was/v6/common/IconType.html" title="class in org.apache.openejb.jee.was.v6.common"><span class="typeNameLink">IconType</span></a></li>
@@ -4091,7 +4095,8 @@
 <li type="circle">org.apache.openejb.config.<a href="org/apache/openejb/config/ServiceUtils.ProviderInfo.html" title="class in org.apache.openejb.config"><span class="typeNameLink">ServiceUtils.ProviderInfo</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Servlet</span></a></li>
 <li type="circle">org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/Servlet.html" title="class in org.apache.openejb.jee.sun"><span class="typeNameLink">Servlet</span></a></li>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">ServletInputStream
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">ServletByteArrayIntputStream</span></a></li>
@@ -5238,7 +5243,10 @@
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpRequest.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpRequest</span></a></li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpResponse.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpResponse</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
 <li type="circle">org.apache.openejb.core.ivm.<a href="org/apache/openejb/core/ivm/IntraVmProxy.html" title="interface in org.apache.openejb.core.ivm"><span class="typeNameLink">IntraVmProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.openejb.spi.<a href="org/apache/openejb/spi/Service.html" title="interface in org.apache.openejb.spi"><span class="typeNameLink">Service</span></a>
diff --git a/tomee-10.0/javadoc/serialized-form.html b/tomee-10.0/javadoc/serialized-form.html
index fe0387d971..07a39e8775 100644
--- a/tomee-10.0/javadoc/serialized-form.html
+++ b/tomee-10.0/javadoc/serialized-form.html
@@ -8120,11 +8120,74 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpSessionProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpSessionProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.InjectionFailedException">
 <!--   -->
 </a>
 <h3>Class <a href="org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.InjectionFailedException</a> extends java.lang.IllegalStateException implements Serializable</h3>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.ServletContextProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.ServletContextProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.TomEERuntimeException">
 <!--   -->
 </a>
diff --git a/tomee-8.0/javadoc/allclasses-frame.html b/tomee-8.0/javadoc/allclasses-frame.html
index 388fcd320c..02734a667d 100644
--- a/tomee-8.0/javadoc/allclasses-frame.html
+++ b/tomee-8.0/javadoc/allclasses-frame.html
@@ -1388,8 +1388,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util" target="classFrame">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee" target="classFrame">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Icon$JAXB</a></li>
@@ -2873,7 +2879,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic" target="classFrame">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletListener</a></li>
diff --git a/tomee-8.0/javadoc/allclasses-noframe.html b/tomee-8.0/javadoc/allclasses-noframe.html
index 230d610102..aa46c2b59b 100644
--- a/tomee-8.0/javadoc/allclasses-noframe.html
+++ b/tomee-8.0/javadoc/allclasses-noframe.html
@@ -1388,8 +1388,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee">Icon$JAXB</a></li>
@@ -2873,7 +2879,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd">ServletListener</a></li>
diff --git a/tomee-8.0/javadoc/index-all.html b/tomee-8.0/javadoc/index-all.html
index 776eff2b1d..85e3cb7c27 100644
--- a/tomee-8.0/javadoc/index-all.html
+++ b/tomee-8.0/javadoc/index-all.html
@@ -7336,6 +7336,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/Contexts.html#Contexts--">Contexts()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/Contexts.html" title="class in org.apache.tomee.catalina">Contexts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span> - Static variable in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/threads/impl/ContextServiceImpl.html" title="class in org.apache.openejb.threads.impl"><span class="typeNameLink">ContextServiceImpl</span></a> - Class in <a href="org/apache/openejb/threads/impl/package-summary.html">org.apache.openejb.threads.impl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/threads/impl/ContextServiceImpl.html#ContextServiceImpl--">ContextServiceImpl()</a></span> - Constructor for class org.apache.openejb.threads.impl.<a href="org/apache/openejb/threads/impl/ContextServiceImpl.html" title="class in org.apache.openejb.threads.impl">ContextServiceImpl</a></dt>
@@ -19813,6 +19815,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/environment/Hosts.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.tomee.catalina.environment.<a href="org/apache/tomee/catalina/environment/Hosts.html" title="class in org.apache.tomee.catalina.environment">Hosts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html#get--">get()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder.StandardContextInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomEEContainerListener.html#get--">get()</a></span> - Static method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomEEContainerListener.html" title="class in org.apache.tomee.catalina">TomEEContainerListener</a></dt>
@@ -23348,8 +23356,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html#getContextRoot--">getContextRoot()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina">TomcatDeploymentLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#getContexts--">getContexts()</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.html#getContextService--">getContextService()</a></span> - Method in class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/loader/TomcatHelper.html#getContextState-StandardContext-">getContextState(StandardContext)</a></span> - Static method in class org.apache.tomee.loader.<a href="org/apache/tomee/loader/TomcatHelper.html" title="class in org.apache.tomee.loader">TomcatHelper</a></dt>
@@ -42175,6 +42181,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/urlhandler/resource/Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.openejb.util.urlhandler.resource.<a href="org/apache/openejb/util/urlhandler/resource/Handler.html" title="class in org.apache.openejb.util.urlhandler.resource">Handler</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Handler$JAXB</span></a> - Class in <a href="org/apache/openejb/jee/package-summary.html">org.apache.openejb.jee</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Handler$JAXB.html#Handler:DJAXB--">Handler$JAXB()</a></span> - Constructor for class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee">Handler$JAXB</a></dt>
@@ -43037,6 +43049,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html#HttpServletRequestBean-WebBeansContext-">HttpServletRequestBean(WebBeansContext)</a></span> - Constructor for class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle.HttpServletRequestBean</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/SunWebApp.html#httpservletSecurityProvider">httpservletSecurityProvider</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/SunWebApp.html" title="class in org.apache.openejb.jee.sun">SunWebApp</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSession</span></a> - Interface in <a href="org/apache/openejb/server/httpd/package-summary.html">org.apache.openejb.server.httpd</a></dt>
@@ -43047,6 +43065,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html#HttpSessionImpl--">HttpSessionImpl()</a></span> - Constructor for class org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.arquillian.common.<a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html" title="class in org.apache.openejb.arquillian.common">TomEEConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.maven.plugins.<a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html" title="class in org.apache.openejb.maven.plugins">TomEEEmbeddedMojo</a></dt>
@@ -45895,7 +45919,9 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/web/WebInitialContext.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.openejb.web.<a href="org/apache/openejb/web/WebInitialContext.html" title="class in org.apache.openejb.web">WebInitialContext</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina">OpenEJBSecurityListener.RequestCapturer</a></dt>
 <dd>&nbsp;</dd>
@@ -45903,6 +45929,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/routing/RouterValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.routing.<a href="org/apache/tomee/catalina/routing/RouterValve.html" title="class in org.apache.tomee.catalina.routing">RouterValve</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/valve/LazyValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.valve.<a href="org/apache/tomee/catalina/valve/LazyValve.html" title="class in org.apache.tomee.catalina.valve">LazyValve</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html#invoke-InvocationContext-">invoke(InvocationContext)</a></span> - Method in class org.apache.tomee.microprofile.jwt.bval.<a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html" title="class in org.apache.tomee.microprofile.jwt.bval">BValInterceptor</a></dt>
@@ -60086,6 +60114,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/PojoSerialization.html#readResolve--">readResolve()</a></span> - Method in class org.apache.openejb.util.<a href="org/apache/openejb/util/PojoSerialization.html" title="class in org.apache.openejb.util">PojoSerialization</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#readResourceAdapter-XoXMLStreamReader-RuntimeContext-">readResourceAdapter(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html#readResourceEnvRef-XoXMLStreamReader-RuntimeContext-">readResourceEnvRef(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html" title="class in org.apache.openejb.jee">ResourceEnvRef$JAXB</a></dt>
@@ -63548,6 +63582,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/wls/Compatibility.html#serializeCharArrayToBytes">serializeCharArrayToBytes</a></span> - Variable in class org.apache.openejb.jee.wls.<a href="org/apache/openejb/jee/wls/Compatibility.html" title="class in org.apache.openejb.jee.wls">Compatibility</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/client/JNDIContext.html#SERIALIZER">SERIALIZER</a></span> - Static variable in class org.apache.openejb.client.<a href="org/apache/openejb/client/JNDIContext.html" title="class in org.apache.openejb.client">JNDIContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/spi/Serializer.html" title="class in org.apache.openejb.spi"><span class="typeNameLink">Serializer</span></a> - Class in <a href="org/apache/openejb/spi/package-summary.html">org.apache.openejb.spi</a></dt>
@@ -64329,9 +64369,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Servlet.html#servletClass">servletClass</a></span> - Variable in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee">Servlet</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> - Class in <a href="org/apache/tomee/catalina/cdi/package-summary.html">org.apache.tomee.catalina.cdi</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#ServletContextHandler--">ServletContextHandler()</a></span> - Constructor for class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html#servletImplClass">servletImplClass</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html" title="class in org.apache.openejb.jee.sun">WebserviceEndpoint</a></dt>
 <dd>&nbsp;</dd>
@@ -87462,6 +87504,12 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/persistence/JtaEntityManager.html#writeReplace--">writeReplace()</a></span> - Method in class org.apache.openejb.persistence.<a href="org/apache/openejb/persistence/JtaEntityManager.html" title="class in org.apache.openejb.persistence">JtaEntityManager</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html#writeRequiredConfigProperty-XoXMLStreamWriter-org.apache.openejb.jee.RequiredConfigProperty-RuntimeContext-">writeRequiredConfigProperty(XoXMLStreamWriter, RequiredConfigProperty, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html" title="class in org.apache.openejb.jee">RequiredConfigProperty$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#writeResourceAdapter-XoXMLStreamWriter-org.apache.openejb.jee.ResourceAdapter-RuntimeContext-">writeResourceAdapter(XoXMLStreamWriter, ResourceAdapter, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
index 581e9f2cfd..93ebf3e2a6 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
@@ -328,7 +328,7 @@ extends java.util.LinkedHashMap&lt;java.lang.Object,java.lang.Object&gt;</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
similarity index 69%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
index fa726ab976..afd715c6a6 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpServletRequestProxy.Handler" class="title">Class HttpServletRequestProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
similarity index 71%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
index c2db50a95b..0735ee8129 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpServletRequestProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpServletRequestProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpServletRequestProxy.Serialized" class="title">Class HttpServletRequestProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
index fa726ab976..0b8dd2e6ab 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpServletRequestProxy" class="title">Interface HttpServletRequestProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpServletRequestProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpServletRequest</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpServletRequest&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
similarity index 70%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
index fa726ab976..f196a9a28e 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpSessionProxy.Handler" class="title">Class HttpSessionProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
similarity index 73%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
index c2db50a95b..8dfbfcf3ac 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpSessionProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpSessionProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpSessionProxy.Serialized" class="title">Class HttpSessionProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpSessionProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
index fa726ab976..b2c41704fe 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpSessionProxy" class="title">Interface HttpSessionProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpSessionProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpSession</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpSession&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
index 143245e032..d19035be04 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -199,7 +199,7 @@ extends StandardContext</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServerListener.html
index fa726ab976..69543c6ab5 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServerListener.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
@@ -225,7 +225,7 @@ extends java.lang.Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
similarity index 71%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
index fa726ab976..cc49ce8fcd 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Handler" class="title">Class ServletContextProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
similarity index 77%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
index fa726ab976..4f984ee603 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Serialized" class="title">Class ServletContextProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.ServletContextProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -128,7 +141,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +159,8 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +184,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +201,18 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +242,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
similarity index 58%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
index c2db50a95b..6a1c98006c 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>ServletContextProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="ServletContextProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -49,11 +49,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,48 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Interface ServletContextProxy" class="title">Interface ServletContextProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public interface <span class="typeNameLabel">ServletContextProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -145,23 +142,20 @@ extends SimpleTcpCluster</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static ServletContext</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -170,36 +164,33 @@ extends SimpleTcpCluster</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
-</li>
-</ul>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>get</h4>
+<pre>static&nbsp;ServletContext&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -230,11 +221,11 @@ extends SimpleTcpCluster</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -254,15 +245,15 @@ extends SimpleTcpCluster</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
index c2db50a95b..72fd497a55 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -229,7 +229,7 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
index d5e071119b..ceee3faecb 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
@@ -165,32 +165,36 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#DEFAULT_J2EE_SERVER">DEFAULT_J2EE_SERVER</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#IGNORE_CONTEXT">IGNORE_CONTEXT</a></span></code>
 <div class="block">Flag for ignore context</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_CROSSCONTEXT_PROPERTY">OPENEJB_CROSSCONTEXT_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_JSESSION_ID_SUPPORT">OPENEJB_JSESSION_ID_SUPPORT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES">OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_SESSION_MANAGER_PROPERTY">OPENEJB_SESSION_MANAGER_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_WEBAPP_MODULE_ID">OPENEJB_WEBAPP_MODULE_ID</a></span></code>&nbsp;</td>
 </tr>
@@ -494,7 +498,7 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <a name="OPENEJB_WEBAPP_MODULE_ID">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>OPENEJB_WEBAPP_MODULE_ID</h4>
 <pre>public static final&nbsp;java.lang.String OPENEJB_WEBAPP_MODULE_ID</pre>
@@ -504,6 +508,15 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 </dl>
 </li>
 </ul>
+<a name="CONTEXTS">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CONTEXTS</h4>
+<pre>public static final&nbsp;java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt; CONTEXTS</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
index a49451feaf..77f2221cd1 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -248,7 +248,7 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
index 1440050403..8f7b59dc7a 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
@@ -13,7 +13,6 @@
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
 <li><a href="WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">WebBeansThreadBindingListener</a></li>
 </ul>
 </div>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
index 357e4c0878..ffea68b30a 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
@@ -82,10 +82,6 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi">WebBeansThreadBindingListener</a></td>
 <td class="colLast">
 <div class="block">For Tomcat we need to implement a ThreadBindingListener to
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
index e909d55453..137211c2b5 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
@@ -80,7 +80,6 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
 <li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">WebBeansThreadBindingListener</span></a></li>
 </ul>
 </li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/package-frame.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/package-frame.html
index 84e4afc657..91b9ab34c2 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/package-frame.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/package-frame.html
@@ -14,6 +14,9 @@
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
 <li><a href="ContextListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ContextListener</span></a></li>
+<li><a href="HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
 <li><a href="WebDeploymentListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">WebDeploymentListener</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
@@ -22,6 +25,10 @@
 <li><a href="ContextValue.html" title="class in org.apache.tomee.catalina" target="classFrame">ContextValue</a></li>
 <li><a href="GlobalListenerSupport.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport</a></li>
 <li><a href="GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport.MoniterableHashMap</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
+<li><a href="HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="IgnoredStandardContext.html" title="class in org.apache.tomee.catalina" target="classFrame">IgnoredStandardContext</a></li>
 <li><a href="JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina" target="classFrame">JavaeeInstanceManager</a></li>
 <li><a href="LazyStopLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">LazyStopLoader</a></li>
@@ -35,6 +42,8 @@
 <li><a href="OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBSecurityListener.RequestCapturer</a></li>
 <li><a href="OpenEJBValve.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBValve</a></li>
 <li><a href="ServerListener.html" title="class in org.apache.tomee.catalina" target="classFrame">ServerListener</a></li>
+<li><a href="ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina" target="classFrame">SimpleTomEETcpCluster</a></li>
 <li><a href="TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatDeploymentLoader</a></li>
 <li><a href="TomcatJavaJndiBinder.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatJavaJndiBinder</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/package-summary.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/package-summary.html
index 9f8df99702..cc7e0a8b47 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/package-summary.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/package-summary.html
@@ -88,6 +88,18 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina">WebDeploymentListener</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -122,6 +134,22 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina">IgnoredStandardContext</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -177,6 +205,14 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina">SimpleTomEETcpCluster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/package-tree.html b/tomee-8.0/javadoc/org/apache/tomee/catalina/package-tree.html
index a7e1e890e1..240a45411a 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/package-tree.html
+++ b/tomee-8.0/javadoc/org/apache/tomee/catalina/package-tree.html
@@ -110,6 +110,10 @@
 </ul>
 </li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">GlobalListenerSupport</span></a> (implements java.beans.PropertyChangeListener)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">JavaeeInstanceManager</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopLoader</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopStandardRoot.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopStandardRoot</span></a></li>
@@ -151,6 +155,8 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">SimpleTcpCluster
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">SimpleTomEETcpCluster</span></a></li>
@@ -215,6 +221,13 @@
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ContextListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ContextListener</span></a></li>
+<li type="circle">java.io.Serializable
+<ul>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">WebDeploymentListener</span></a></li>
 </ul>
 </div>
diff --git a/tomee-8.0/javadoc/overview-tree.html b/tomee-8.0/javadoc/overview-tree.html
index 78fe6dc192..2ff4d11d8b 100644
--- a/tomee-8.0/javadoc/overview-tree.html
+++ b/tomee-8.0/javadoc/overview-tree.html
@@ -2526,6 +2526,8 @@
 <li type="circle">org.apache.tomee.loader.<a href="org/apache/tomee/loader/LoaderServlet.html" title="class in org.apache.tomee.loader"><span class="typeNameLink">LoaderServlet</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">HttpServletRequestWrapper
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/EEFilter.NoCdiRequest.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">EEFilter.NoCdiRequest</span></a>
@@ -2551,6 +2553,8 @@
 </ul>
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSessionImpl</span></a> (implements org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd">HttpSession</a>)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.openejb.server.httpd.util.<a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util"><span class="typeNameLink">HttpUtil</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Icon</span></a> (implements org.apache.openejb.jee.<a href="org/apache/openejb/jee/Keyable.html" title="interface in org.apache.openejb.jee">Keyable</a>&lt;K&gt;)</li>
 <li type="circle">org.apache.openejb.jee.was.v6.common.<a href="org/apache/openejb/jee/was/v6/common/IconType.html" title="class in org.apache.openejb.jee.was.v6.common"><span class="typeNameLink">IconType</span></a></li>
@@ -4086,7 +4090,8 @@
 <li type="circle">org.apache.openejb.config.<a href="org/apache/openejb/config/ServiceUtils.ProviderInfo.html" title="class in org.apache.openejb.config"><span class="typeNameLink">ServiceUtils.ProviderInfo</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Servlet</span></a></li>
 <li type="circle">org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/Servlet.html" title="class in org.apache.openejb.jee.sun"><span class="typeNameLink">Servlet</span></a></li>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">ServletInputStream
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">ServletByteArrayIntputStream</span></a></li>
@@ -5251,7 +5256,10 @@
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpRequest.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpRequest</span></a></li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpResponse.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpResponse</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
 <li type="circle">org.apache.openejb.core.ivm.<a href="org/apache/openejb/core/ivm/IntraVmProxy.html" title="interface in org.apache.openejb.core.ivm"><span class="typeNameLink">IntraVmProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.openejb.spi.<a href="org/apache/openejb/spi/Service.html" title="interface in org.apache.openejb.spi"><span class="typeNameLink">Service</span></a>
diff --git a/tomee-8.0/javadoc/serialized-form.html b/tomee-8.0/javadoc/serialized-form.html
index b6bad3cf12..ac22da077a 100644
--- a/tomee-8.0/javadoc/serialized-form.html
+++ b/tomee-8.0/javadoc/serialized-form.html
@@ -8236,11 +8236,74 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpSessionProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpSessionProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.InjectionFailedException">
 <!--   -->
 </a>
 <h3>Class <a href="org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.InjectionFailedException</a> extends java.lang.IllegalStateException implements Serializable</h3>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.ServletContextProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.ServletContextProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.TomEERuntimeException">
 <!--   -->
 </a>
diff --git a/tomee-9.0/javadoc/allclasses-frame.html b/tomee-9.0/javadoc/allclasses-frame.html
index 54e2f1cbff..8d60d81e55 100644
--- a/tomee-9.0/javadoc/allclasses-frame.html
+++ b/tomee-9.0/javadoc/allclasses-frame.html
@@ -1383,8 +1383,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd" target="classFrame"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd" target="classFrame">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util" target="classFrame">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee" target="classFrame">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Icon$JAXB</a></li>
@@ -2861,7 +2867,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee" target="classFrame">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic" target="classFrame">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd" target="classFrame">ServletListener</a></li>
diff --git a/tomee-9.0/javadoc/allclasses-noframe.html b/tomee-9.0/javadoc/allclasses-noframe.html
index a0c6cb0cd0..7057f7b2b0 100644
--- a/tomee-9.0/javadoc/allclasses-noframe.html
+++ b/tomee-9.0/javadoc/allclasses-noframe.html
@@ -1383,8 +1383,14 @@
 <li><a href="org/apache/openejb/server/httpd/HttpResponseImpl.html" title="class in org.apache.openejb.server.httpd">HttpResponseImpl</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServer.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpServer</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpServerFactory.html" title="class in org.apache.openejb.server.httpd">HttpServerFactory</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="interfaceName">HttpSession</span></a></li>
 <li><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util">HttpUtil</a></li>
 <li><a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee">Icon</a></li>
 <li><a href="org/apache/openejb/jee/Icon$JAXB.html" title="class in org.apache.openejb.jee">Icon$JAXB</a></li>
@@ -2861,7 +2867,9 @@
 <li><a href="org/apache/openejb/jee/Servlet$JAXB.html" title="class in org.apache.openejb.jee">Servlet$JAXB</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayIntputStream</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletByteArrayOutputStream.html" title="class in org.apache.openejb.server.httpd">ServletByteArrayOutputStream</a></li>
-<li><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="interfaceName">ServletContextProxy</span></a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></li>
+<li><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></li>
 <li><a href="org/apache/openejb/assembler/classic/ServletInfo.html" title="class in org.apache.openejb.assembler.classic">ServletInfo</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletIntputStreamAdapter.html" title="class in org.apache.openejb.server.httpd">ServletIntputStreamAdapter</a></li>
 <li><a href="org/apache/openejb/server/httpd/ServletListener.html" title="class in org.apache.openejb.server.httpd">ServletListener</a></li>
diff --git a/tomee-9.0/javadoc/index-all.html b/tomee-9.0/javadoc/index-all.html
index 8370726a5d..6028a97896 100644
--- a/tomee-9.0/javadoc/index-all.html
+++ b/tomee-9.0/javadoc/index-all.html
@@ -7314,6 +7314,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/Contexts.html#Contexts--">Contexts()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/Contexts.html" title="class in org.apache.tomee.catalina">Contexts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span> - Static variable in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/threads/impl/ContextServiceImpl.html" title="class in org.apache.openejb.threads.impl"><span class="typeNameLink">ContextServiceImpl</span></a> - Class in <a href="org/apache/openejb/threads/impl/package-summary.html">org.apache.openejb.threads.impl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/threads/impl/ContextServiceImpl.html#ContextServiceImpl--">ContextServiceImpl()</a></span> - Constructor for class org.apache.openejb.threads.impl.<a href="org/apache/openejb/threads/impl/ContextServiceImpl.html" title="class in org.apache.openejb.threads.impl">ContextServiceImpl</a></dt>
@@ -19732,6 +19734,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/environment/Hosts.html#get-java.lang.String-">get(String)</a></span> - Method in class org.apache.tomee.catalina.environment.<a href="org/apache/tomee/catalina/environment/Hosts.html" title="class in org.apache.tomee.catalina.environment">Hosts</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#get--">get()</a></span> - Static method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html#get--">get()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatWebAppBuilder.StandardContextInfo.html" title="class in org.apache.tomee.catalina">TomcatWebAppBuilder.StandardContextInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomEEContainerListener.html#get--">get()</a></span> - Static method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomEEContainerListener.html" title="class in org.apache.tomee.catalina">TomEEContainerListener</a></dt>
@@ -23267,8 +23275,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html#getContextRoot--">getContextRoot()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina">TomcatDeploymentLoader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#getContexts--">getContexts()</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.html#getContextService--">getContextService()</a></span> - Method in class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/loader/TomcatHelper.html#getContextState-StandardContext-">getContextState(StandardContext)</a></span> - Static method in class org.apache.tomee.loader.<a href="org/apache/tomee/loader/TomcatHelper.html" title="class in org.apache.tomee.loader">TomcatHelper</a></dt>
@@ -41984,6 +41990,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/urlhandler/resource/Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.openejb.util.urlhandler.resource.<a href="org/apache/openejb/util/urlhandler/resource/Handler.html" title="class in org.apache.openejb.util.urlhandler.resource">Handler</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Handler$JAXB</span></a> - Class in <a href="org/apache/openejb/jee/package-summary.html">org.apache.openejb.jee</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Handler$JAXB.html#Handler:DJAXB--">Handler$JAXB()</a></span> - Constructor for class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Handler$JAXB.html" title="class in org.apache.openejb.jee">Handler$JAXB</a></dt>
@@ -42832,6 +42844,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html#HttpServletRequestBean-WebBeansContext-">HttpServletRequestBean(WebBeansContext)</a></span> - Constructor for class org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/OpenEJBLifecycle.HttpServletRequestBean.html" title="class in org.apache.openejb.cdi">OpenEJBLifecycle.HttpServletRequestBean</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/SunWebApp.html#httpservletSecurityProvider">httpservletSecurityProvider</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/SunWebApp.html" title="class in org.apache.openejb.jee.sun">SunWebApp</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSession</span></a> - Interface in <a href="org/apache/openejb/server/httpd/package-summary.html">org.apache.openejb.server.httpd</a></dt>
@@ -42842,6 +42860,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/server/httpd/HttpSessionImpl.html#HttpSessionImpl--">HttpSessionImpl()</a></span> - Constructor for class org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd">HttpSessionImpl</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.arquillian.common.<a href="org/apache/openejb/arquillian/common/TomEEConfiguration.html" title="class in org.apache.openejb.arquillian.common">TomEEConfiguration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html#httpsPort">httpsPort</a></span> - Variable in class org.apache.openejb.maven.plugins.<a href="org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.html" title="class in org.apache.openejb.maven.plugins">TomEEEmbeddedMojo</a></dt>
@@ -45692,7 +45716,9 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/web/WebInitialContext.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.openejb.web.<a href="org/apache/openejb/web/WebInitialContext.html" title="class in org.apache.openejb.web">WebInitialContext</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina">OpenEJBSecurityListener.RequestCapturer</a></dt>
 <dd>&nbsp;</dd>
@@ -45700,6 +45726,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/routing/RouterValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.routing.<a href="org/apache/tomee/catalina/routing/RouterValve.html" title="class in org.apache.tomee.catalina.routing">RouterValve</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke(Object, Method, Object[])</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/valve/LazyValve.html#invoke-Request-Response-">invoke(Request, Response)</a></span> - Method in class org.apache.tomee.catalina.valve.<a href="org/apache/tomee/catalina/valve/LazyValve.html" title="class in org.apache.tomee.catalina.valve">LazyValve</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html#invoke-InvocationContext-">invoke(InvocationContext)</a></span> - Method in class org.apache.tomee.microprofile.jwt.bval.<a href="org/apache/tomee/microprofile/jwt/bval/BValInterceptor.html" title="class in org.apache.tomee.microprofile.jwt.bval">BValInterceptor</a></dt>
@@ -59830,6 +59858,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/util/PojoSerialization.html#readResolve--">readResolve()</a></span> - Method in class org.apache.openejb.util.<a href="org/apache/openejb/util/PojoSerialization.html" title="class in org.apache.openejb.util">PojoSerialization</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve()</a></span> - Method in class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#readResourceAdapter-XoXMLStreamReader-RuntimeContext-">readResourceAdapter(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html#readResourceEnvRef-XoXMLStreamReader-RuntimeContext-">readResourceEnvRef(XoXMLStreamReader, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceEnvRef$JAXB.html" title="class in org.apache.openejb.jee">ResourceEnvRef$JAXB</a></dt>
@@ -63292,6 +63326,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/wls/Compatibility.html#serializeCharArrayToBytes">serializeCharArrayToBytes</a></span> - Variable in class org.apache.openejb.jee.wls.<a href="org/apache/openejb/jee/wls/Compatibility.html" title="class in org.apache.openejb.jee.wls">Compatibility</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized()</a></span> - Constructor for class org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/client/JNDIContext.html#SERIALIZER">SERIALIZER</a></span> - Static variable in class org.apache.openejb.client.<a href="org/apache/openejb/client/JNDIContext.html" title="class in org.apache.openejb.client">JNDIContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/spi/Serializer.html" title="class in org.apache.openejb.spi"><span class="typeNameLink">Serializer</span></a> - Class in <a href="org/apache/openejb/spi/package-summary.html">org.apache.openejb.spi</a></dt>
@@ -64055,9 +64095,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/Servlet.html#servletClass">servletClass</a></span> - Variable in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee">Servlet</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> - Class in <a href="org/apache/tomee/catalina/cdi/package-summary.html">org.apache.tomee.catalina.cdi</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a> - Interface in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html#ServletContextHandler--">ServletContextHandler()</a></span> - Constructor for class org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></dt>
+<dt><a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> - Class in <a href="org/apache/tomee/catalina/package-summary.html">org.apache.tomee.catalina</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html#servletImplClass">servletImplClass</a></span> - Variable in class org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/WebserviceEndpoint.html" title="class in org.apache.openejb.jee.sun">WebserviceEndpoint</a></dt>
 <dd>&nbsp;</dd>
@@ -87066,6 +87108,12 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/persistence/JtaEntityManager.html#writeReplace--">writeReplace()</a></span> - Method in class org.apache.openejb.persistence.<a href="org/apache/openejb/persistence/JtaEntityManager.html" title="class in org.apache.openejb.persistence">JtaEntityManager</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace()</a></span> - Method in interface org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html#writeRequiredConfigProperty-XoXMLStreamWriter-org.apache.openejb.jee.RequiredConfigProperty-RuntimeContext-">writeRequiredConfigProperty(XoXMLStreamWriter, RequiredConfigProperty, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/RequiredConfigProperty$JAXB.html" title="class in org.apache.openejb.jee">RequiredConfigProperty$JAXB</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html#writeResourceAdapter-XoXMLStreamWriter-org.apache.openejb.jee.ResourceAdapter-RuntimeContext-">writeResourceAdapter(XoXMLStreamWriter, ResourceAdapter, RuntimeContext)</a></span> - Static method in class org.apache.openejb.jee.<a href="org/apache/openejb/jee/ResourceAdapter$JAXB.html" title="class in org.apache.openejb.jee">ResourceAdapter$JAXB</a></dt>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
index 581e9f2cfd..93ebf3e2a6 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
@@ -328,7 +328,7 @@ extends java.util.LinkedHashMap&lt;java.lang.Object,java.lang.Object&gt;</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
similarity index 69%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
index fa726ab976..afd715c6a6 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpServletRequestProxy.Handler" class="title">Class HttpServletRequestProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
similarity index 71%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
index c2db50a95b..0735ee8129 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpServletRequestProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpServletRequestProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpServletRequestProxy.Serialized" class="title">Class HttpServletRequestProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpServletRequestProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
index fa726ab976..0b8dd2e6ab 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpServletRequestProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpServletRequestProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpServletRequestProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpServletRequestProxy" class="title">Interface HttpServletRequestProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpServletRequestProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpServletRequest</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpServletRequest&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpServletRequestProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpServletRequestProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
similarity index 70%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
index fa726ab976..f196a9a28e 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class HttpSessionProxy.Handler" class="title">Class HttpSessionProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
similarity index 73%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
index c2db50a95b..8dfbfcf3ac 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>HttpSessionProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="HttpSessionProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,29 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Class HttpSessionProxy.Serialized" class="title">Class HttpSessionProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
+<li>org.apache.tomee.catalina.HttpSessionProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public static class <span class="typeNameLabel">HttpSessionProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.HttpSessionProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -133,7 +141,7 @@ extends SimpleTcpCluster</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,8 +159,8 @@ extends SimpleTcpCluster</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -176,13 +184,13 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -193,13 +201,18 @@ extends SimpleTcpCluster</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -229,12 +242,12 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
similarity index 55%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
index fa726ab976..b2c41704fe 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/HttpSessionProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>HttpSessionProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="HttpSessionProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,43 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Interface HttpSessionProxy" class="title">Interface HttpSessionProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public interface <span class="typeNameLabel">HttpSessionProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,23 +142,20 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>static HttpSession</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -165,36 +164,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>get</h4>
+<pre>static&nbsp;HttpSession&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -224,12 +220,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/HttpSessionProxy.html" target="_top">Frames</a></li>
+<li><a href="HttpSessionProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -249,15 +245,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
index 143245e032..d19035be04 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/IgnoredStandardContext.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -199,7 +199,7 @@ extends StandardContext</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServerListener.html
index fa726ab976..69543c6ab5 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServerListener.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
@@ -225,7 +225,7 @@ extends java.lang.Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
similarity index 71%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
index fa726ab976..cc49ce8fcd 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Handler.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Handler</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Handler";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,33 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Handler" class="title">Class ServletContextProxy.Handler</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Handler</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.reflect.InvocationHandler</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Handler</span>
+extends java.lang.Object
+implements java.lang.reflect.InvocationHandler</pre>
 </li>
 </ul>
 </div>
@@ -128,7 +137,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#Handler--">Handler</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +155,10 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html#invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">invoke</a></span>(java.lang.Object&nbsp;proxy,
+      java.lang.reflect.Method&nbsp;method,
+      java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +182,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Handler--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Handler</h4>
+<pre>public&nbsp;Handler()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +199,22 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="invoke-java.lang.Object-java.lang.reflect.Method-java.lang.Object:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>invoke</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;invoke(java.lang.Object&nbsp;proxy,
+                               java.lang.reflect.Method&nbsp;method,
+                               java.lang.Object[]&nbsp;args)
+                        throws java.lang.Throwable</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>invoke</code>&nbsp;in interface&nbsp;<code>java.lang.reflect.InvocationHandler</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.Throwable</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +244,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Handler.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Handler.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
similarity index 77%
copy from tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
index fa726ab976..4f984ee603 100644
--- a/tomee-10.0/javadoc/org/apache/tomee/catalina/ServerListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.Serialized.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>ServerListener</title>
+<title>ServletContextProxy.Serialized</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ServerListener";
+            parent.document.title="ServletContextProxy.Serialized";
         }
     }
     catch(err) {
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,24 +92,37 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class ServerListener" class="title">Class ServerListener</h2>
+<h2 title="Class ServletContextProxy.Serialized" class="title">Class ServletContextProxy.Serialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.tomee.catalina.ServerListener</li>
+<li>org.apache.tomee.catalina.ServletContextProxy.Serialized</li>
 </ul>
 </li>
 </ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing interface:</dt>
+<dd><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">ServerListener</span>
-extends java.lang.Object</pre>
+<pre>public static class <span class="typeNameLabel">ServletContextProxy.Serialized</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.apache.tomee.catalina.ServletContextProxy.Serialized">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -128,7 +141,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#ServerListener--">ServerListener</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#Serialized--">Serialized</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,8 +159,8 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServerListener.html#lifecycleEvent-LifecycleEvent-">lifecycleEvent</a></span>(LifecycleEvent&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html#readResolve--">readResolve</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -171,13 +184,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ServerListener--">
+<a name="Serialized--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ServerListener</h4>
-<pre>public&nbsp;ServerListener()</pre>
+<h4>Serialized</h4>
+<pre>public&nbsp;Serialized()</pre>
 </li>
 </ul>
 </li>
@@ -188,13 +201,18 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="lifecycleEvent-LifecycleEvent-">
+<a name="readResolve--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>lifecycleEvent</h4>
-<pre>public&nbsp;void&nbsp;lifecycleEvent(LifecycleEvent&nbsp;event)</pre>
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -224,12 +242,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/OpenEJBValve.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/ServerListener.html" target="_top">Frames</a></li>
-<li><a href="ServerListener.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.Serialized.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.Serialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
similarity index 58%
copy from tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
copy to tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
index c2db50a95b..6a1c98006c 100644
--- a/tomee-8.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/ServletContextProxy.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>SimpleTomEETcpCluster</title>
+<title>ServletContextProxy</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleTomEETcpCluster";
+            parent.document.title="ServletContextProxy";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":17,"i1":6};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -49,11 +49,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,15 +73,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -92,48 +92,45 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.tomee.catalina</div>
-<h2 title="Class SimpleTomEETcpCluster" class="title">Class SimpleTomEETcpCluster</h2>
+<h2 title="Interface ServletContextProxy" class="title">Interface ServletContextProxy</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>SimpleTcpCluster</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.tomee.catalina.SimpleTomEETcpCluster</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleTomEETcpCluster</span>
-extends SimpleTcpCluster</pre>
+<pre>public interface <span class="typeNameLabel">ServletContextProxy</span>
+extends java.io.Serializable</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#SimpleTomEETcpCluster-SimpleTcpCluster-">SimpleTomEETcpCluster</a></span>(SimpleTcpCluster&nbsp;from)</code>&nbsp;</td>
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -145,23 +142,20 @@ extends SimpleTcpCluster</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html#checkDefaults--">checkDefaults</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static ServletContext</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#get--">get</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Object</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html#writeReplace--">writeReplace</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
 </li>
 </ul>
 </li>
@@ -170,36 +164,33 @@ extends SimpleTcpCluster</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
-<h3>Constructor Detail</h3>
-<a name="SimpleTomEETcpCluster-SimpleTcpCluster-">
+<h3>Method Detail</h3>
+<a name="writeReplace--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
-<h4>SimpleTomEETcpCluster</h4>
-<pre>public&nbsp;SimpleTomEETcpCluster(SimpleTcpCluster&nbsp;from)</pre>
-</li>
-</ul>
+<h4>writeReplace</h4>
+<pre>java.lang.Object&nbsp;writeReplace()
+                       throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
 </li>
 </ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="checkDefaults--">
+<a name="get--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>checkDefaults</h4>
-<pre>protected&nbsp;void&nbsp;checkDefaults()</pre>
+<h4>get</h4>
+<pre>static&nbsp;ServletContext&nbsp;get()</pre>
 </li>
 </ul>
 </li>
@@ -230,11 +221,11 @@ extends SimpleTcpCluster</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/apache/tomee/catalina/SimpleTomEETcpCluster.html" target="_top">Frames</a></li>
-<li><a href="SimpleTomEETcpCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/apache/tomee/catalina/ServletContextProxy.html" target="_top">Frames</a></li>
+<li><a href="ServletContextProxy.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -254,15 +245,15 @@ extends SimpleTcpCluster</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
index c2db50a95b..72fd497a55 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/SimpleTomEETcpCluster.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -229,7 +229,7 @@ extends SimpleTcpCluster</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/tomee/catalina/ServerListener.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/tomee/catalina/TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
index d5e071119b..ceee3faecb 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/TomcatWebAppBuilder.html
@@ -165,32 +165,36 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#CONTEXTS">CONTEXTS</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#DEFAULT_J2EE_SERVER">DEFAULT_J2EE_SERVER</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#IGNORE_CONTEXT">IGNORE_CONTEXT</a></span></code>
 <div class="block">Flag for ignore context</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_CROSSCONTEXT_PROPERTY">OPENEJB_CROSSCONTEXT_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_JSESSION_ID_SUPPORT">OPENEJB_JSESSION_ID_SUPPORT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES">OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_SESSION_MANAGER_PROPERTY">OPENEJB_SESSION_MANAGER_PROPERTY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/tomee/catalina/TomcatWebAppBuilder.html#OPENEJB_WEBAPP_MODULE_ID">OPENEJB_WEBAPP_MODULE_ID</a></span></code>&nbsp;</td>
 </tr>
@@ -494,7 +498,7 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 <a name="OPENEJB_WEBAPP_MODULE_ID">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>OPENEJB_WEBAPP_MODULE_ID</h4>
 <pre>public static final&nbsp;java.lang.String OPENEJB_WEBAPP_MODULE_ID</pre>
@@ -504,6 +508,15 @@ implements <a href="../../../../org/apache/openejb/assembler/classic/WebAppBuild
 </dl>
 </li>
 </ul>
+<a name="CONTEXTS">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CONTEXTS</h4>
+<pre>public static final&nbsp;java.util.Map&lt;java.lang.ClassLoader,ServletContext&gt; CONTEXTS</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
index a49451feaf..77f2221cd1 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -248,7 +248,7 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
index 1440050403..8f7b59dc7a 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-frame.html
@@ -13,7 +13,6 @@
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">ServletContextHandler</a></li>
 <li><a href="WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi" target="classFrame">WebBeansThreadBindingListener</a></li>
 </ul>
 </div>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
index 357e4c0878..ffea68b30a 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-summary.html
@@ -82,10 +82,6 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi">ServletContextHandler</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi">WebBeansThreadBindingListener</a></td>
 <td class="colLast">
 <div class="block">For Tomcat we need to implement a ThreadBindingListener to
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
index e909d55453..137211c2b5 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/cdi/package-tree.html
@@ -80,7 +80,6 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
 <li type="circle">org.apache.tomee.catalina.cdi.<a href="../../../../../org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">WebBeansThreadBindingListener</span></a></li>
 </ul>
 </li>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/package-frame.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/package-frame.html
index 84e4afc657..91b9ab34c2 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/package-frame.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/package-frame.html
@@ -14,6 +14,9 @@
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
 <li><a href="ContextListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ContextListener</span></a></li>
+<li><a href="HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpServletRequestProxy</span></a></li>
+<li><a href="HttpSessionProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">HttpSessionProxy</span></a></li>
+<li><a href="ServletContextProxy.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">ServletContextProxy</span></a></li>
 <li><a href="WebDeploymentListener.html" title="interface in org.apache.tomee.catalina" target="classFrame"><span class="interfaceName">WebDeploymentListener</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
@@ -22,6 +25,10 @@
 <li><a href="ContextValue.html" title="class in org.apache.tomee.catalina" target="classFrame">ContextValue</a></li>
 <li><a href="GlobalListenerSupport.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport</a></li>
 <li><a href="GlobalListenerSupport.MoniterableHashMap.html" title="class in org.apache.tomee.catalina" target="classFrame">GlobalListenerSupport.MoniterableHashMap</a></li>
+<li><a href="HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Handler</a></li>
+<li><a href="HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpServletRequestProxy.Serialized</a></li>
+<li><a href="HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Handler</a></li>
+<li><a href="HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">HttpSessionProxy.Serialized</a></li>
 <li><a href="IgnoredStandardContext.html" title="class in org.apache.tomee.catalina" target="classFrame">IgnoredStandardContext</a></li>
 <li><a href="JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina" target="classFrame">JavaeeInstanceManager</a></li>
 <li><a href="LazyStopLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">LazyStopLoader</a></li>
@@ -35,6 +42,8 @@
 <li><a href="OpenEJBSecurityListener.RequestCapturer.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBSecurityListener.RequestCapturer</a></li>
 <li><a href="OpenEJBValve.html" title="class in org.apache.tomee.catalina" target="classFrame">OpenEJBValve</a></li>
 <li><a href="ServerListener.html" title="class in org.apache.tomee.catalina" target="classFrame">ServerListener</a></li>
+<li><a href="ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Handler</a></li>
+<li><a href="ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina" target="classFrame">ServletContextProxy.Serialized</a></li>
 <li><a href="SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina" target="classFrame">SimpleTomEETcpCluster</a></li>
 <li><a href="TomcatDeploymentLoader.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatDeploymentLoader</a></li>
 <li><a href="TomcatJavaJndiBinder.html" title="class in org.apache.tomee.catalina" target="classFrame">TomcatJavaJndiBinder</a></li>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/package-summary.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/package-summary.html
index 9f8df99702..cc7e0a8b47 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/package-summary.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/package-summary.html
@@ -88,6 +88,18 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina">HttpServletRequestProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina">HttpSessionProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina">ServletContextProxy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina">WebDeploymentListener</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -122,6 +134,22 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpServletRequestProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">HttpSessionProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/IgnoredStandardContext.html" title="class in org.apache.tomee.catalina">IgnoredStandardContext</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -177,6 +205,14 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Handler</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">ServletContextProxy.Serialized</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina">SimpleTomEETcpCluster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/tomee-9.0/javadoc/org/apache/tomee/catalina/package-tree.html b/tomee-9.0/javadoc/org/apache/tomee/catalina/package-tree.html
index a7e1e890e1..240a45411a 100644
--- a/tomee-9.0/javadoc/org/apache/tomee/catalina/package-tree.html
+++ b/tomee-9.0/javadoc/org/apache/tomee/catalina/package-tree.html
@@ -110,6 +110,10 @@
 </ul>
 </li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/GlobalListenerSupport.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">GlobalListenerSupport</span></a> (implements java.beans.PropertyChangeListener)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/JavaeeInstanceManager.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">JavaeeInstanceManager</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopLoader.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopLoader</span></a></li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/LazyStopStandardRoot.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">LazyStopStandardRoot</span></a></li>
@@ -151,6 +155,8 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">SimpleTcpCluster
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/SimpleTomEETcpCluster.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">SimpleTomEETcpCluster</span></a></li>
@@ -215,6 +221,13 @@
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ContextListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ContextListener</span></a></li>
+<li type="circle">java.io.Serializable
+<ul>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.tomee.catalina.<a href="../../../../org/apache/tomee/catalina/WebDeploymentListener.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">WebDeploymentListener</span></a></li>
 </ul>
 </div>
diff --git a/tomee-9.0/javadoc/overview-tree.html b/tomee-9.0/javadoc/overview-tree.html
index 9e4f15ab88..468b9db0c1 100644
--- a/tomee-9.0/javadoc/overview-tree.html
+++ b/tomee-9.0/javadoc/overview-tree.html
@@ -2538,6 +2538,8 @@
 <li type="circle">org.apache.tomee.loader.<a href="org/apache/tomee/loader/LoaderServlet.html" title="class in org.apache.tomee.loader"><span class="typeNameLink">LoaderServlet</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">HttpServletRequestWrapper
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/EEFilter.NoCdiRequest.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">EEFilter.NoCdiRequest</span></a>
@@ -2563,6 +2565,8 @@
 </ul>
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSessionImpl.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpSessionImpl</span></a> (implements org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpSession.html" title="interface in org.apache.openejb.server.httpd">HttpSession</a>)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">org.apache.openejb.server.httpd.util.<a href="org/apache/openejb/server/httpd/util/HttpUtil.html" title="class in org.apache.openejb.server.httpd.util"><span class="typeNameLink">HttpUtil</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Icon.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Icon</span></a> (implements org.apache.openejb.jee.<a href="org/apache/openejb/jee/Keyable.html" title="interface in org.apache.openejb.jee">Keyable</a>&lt;K&gt;)</li>
 <li type="circle">org.apache.openejb.jee.was.v6.common.<a href="org/apache/openejb/jee/was/v6/common/IconType.html" title="class in org.apache.openejb.jee.was.v6.common"><span class="typeNameLink">IconType</span></a></li>
@@ -4084,7 +4088,8 @@
 <li type="circle">org.apache.openejb.config.<a href="org/apache/openejb/config/ServiceUtils.ProviderInfo.html" title="class in org.apache.openejb.config"><span class="typeNameLink">ServiceUtils.ProviderInfo</span></a></li>
 <li type="circle">org.apache.openejb.jee.<a href="org/apache/openejb/jee/Servlet.html" title="class in org.apache.openejb.jee"><span class="typeNameLink">Servlet</span></a></li>
 <li type="circle">org.apache.openejb.jee.sun.<a href="org/apache/openejb/jee/sun/Servlet.html" title="class in org.apache.openejb.jee.sun"><span class="typeNameLink">Servlet</span></a></li>
-<li type="circle">org.apache.tomee.catalina.cdi.<a href="org/apache/tomee/catalina/cdi/ServletContextHandler.html" title="class in org.apache.tomee.catalina.cdi"><span class="typeNameLink">ServletContextHandler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Handler.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Handler</span></a> (implements java.lang.reflect.InvocationHandler)</li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy.Serialized</span></a> (implements java.io.Serializable)</li>
 <li type="circle">ServletInputStream
 <ul>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/ServletByteArrayIntputStream.html" title="class in org.apache.openejb.server.httpd"><span class="typeNameLink">ServletByteArrayIntputStream</span></a></li>
@@ -5222,7 +5227,10 @@
 </li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpRequest.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpRequest</span></a></li>
 <li type="circle">org.apache.openejb.server.httpd.<a href="org/apache/openejb/server/httpd/HttpResponse.html" title="interface in org.apache.openejb.server.httpd"><span class="typeNameLink">HttpResponse</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpServletRequestProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpServletRequestProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/HttpSessionProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">HttpSessionProxy</span></a></li>
 <li type="circle">org.apache.openejb.core.ivm.<a href="org/apache/openejb/core/ivm/IntraVmProxy.html" title="interface in org.apache.openejb.core.ivm"><span class="typeNameLink">IntraVmProxy</span></a></li>
+<li type="circle">org.apache.tomee.catalina.<a href="org/apache/tomee/catalina/ServletContextProxy.html" title="interface in org.apache.tomee.catalina"><span class="typeNameLink">ServletContextProxy</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.openejb.spi.<a href="org/apache/openejb/spi/Service.html" title="interface in org.apache.openejb.spi"><span class="typeNameLink">Service</span></a>
diff --git a/tomee-9.0/javadoc/serialized-form.html b/tomee-9.0/javadoc/serialized-form.html
index fe0387d971..07a39e8775 100644
--- a/tomee-9.0/javadoc/serialized-form.html
+++ b/tomee-9.0/javadoc/serialized-form.html
@@ -8120,11 +8120,74 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpServletRequestProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpServletRequestProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpServletRequestProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="blockList"><a name="org.apache.tomee.catalina.HttpSessionProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/HttpSessionProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.HttpSessionProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.InjectionFailedException">
 <!--   -->
 </a>
 <h3>Class <a href="org/apache/tomee/catalina/InjectionFailedException.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.InjectionFailedException</a> extends java.lang.IllegalStateException implements Serializable</h3>
 </li>
+<li class="blockList"><a name="org.apache.tomee.catalina.ServletContextProxy.Serialized">
+<!--   -->
+</a>
+<h3>Class <a href="org/apache/tomee/catalina/ServletContextProxy.Serialized.html" title="class in org.apache.tomee.catalina">org.apache.tomee.catalina.ServletContextProxy.Serialized</a> extends java.lang.Object implements Serializable</h3>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialization Methods</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>readResolve</h4>
+<pre>public&nbsp;java.lang.Object&nbsp;readResolve()
+                             throws java.io.ObjectStreamException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.ObjectStreamException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="blockList"><a name="org.apache.tomee.catalina.TomEERuntimeException">
 <!--   -->
 </a>