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 f36ded3c3 [site-publish] source tomee-site-generator 
https://github.com/apache/tomee-site-generator 
https://ci-builds.apache.org/job/Tomee/job/site-publish
f36ded3c3 is described below

commit f36ded3c3ab15e5b79c971c2dc833c08d7e2422b
Author: jenkins <[email protected]>
AuthorDate: Tue May 2 13:11:10 2023 +0000

    [site-publish] source tomee-site-generator
    https://github.com/apache/tomee-site-generator
    https://ci-builds.apache.org/job/Tomee/job/site-publish
---
 community/contributors.html                        | 990 ---------------------
 latest/javadoc/allclasses-frame.html               |   2 +
 latest/javadoc/allclasses-noframe.html             |   2 +
 latest/javadoc/index-all.html                      |  14 +-
 .../org/apache/openejb/cdi/AppBeanManager.html     | 240 +++++
 ...ectionResolver.html => AppWebBeansContext.html} |  94 +-
 .../apache/openejb/cdi/CdiAppContextsService.html  |   4 +-
 .../openejb/cdi/WebAppInjectionResolver.html       |   6 +-
 .../org/apache/openejb/cdi/package-frame.html      |   2 +
 .../org/apache/openejb/cdi/package-summary.html    |   8 +
 .../org/apache/openejb/cdi/package-tree.html       |  10 +
 latest/javadoc/overview-tree.html                  |  10 +
 tomee-9.0/javadoc/allclasses-frame.html            |   2 +
 tomee-9.0/javadoc/allclasses-noframe.html          |   2 +
 tomee-9.0/javadoc/index-all.html                   |  14 +-
 .../org/apache/openejb/cdi/AppBeanManager.html     | 240 +++++
 .../org/apache/openejb/cdi/AppWebBeansContext.html |  94 +-
 .../apache/openejb/cdi/CdiAppContextsService.html  |   4 +-
 .../openejb/cdi/WebAppInjectionResolver.html       |   6 +-
 .../org/apache/openejb/cdi/package-frame.html      |   2 +
 .../org/apache/openejb/cdi/package-summary.html    |   8 +
 .../org/apache/openejb/cdi/package-tree.html       |  10 +
 tomee-9.0/javadoc/overview-tree.html               |  10 +
 23 files changed, 648 insertions(+), 1126 deletions(-)

diff --git a/community/contributors.html b/community/contributors.html
index da238c05d..99ff7b723 100644
--- a/community/contributors.html
+++ b/community/contributors.html
@@ -103,996 +103,6 @@
               <div class="text-center" style="padding-bottom: 2em;">We want to 
thank the following individuals for contributing to Apache TomEE. An up to date 
contributor list can be found <a 
href="https://github.com/apache/tomee/graphs/contributors";>here</a>. The 
current list of committers can be found <a 
href="https://projects.apache.org/committee.html?tomee";>here</a>.</div>
               <ul>
                 
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/94926?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/dblevins";>dblevins</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1249546?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/rmannibucau";>rmannibucau</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1918442?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/tveronezi";>tveronezi</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1233474?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/jeanouii";>jeanouii</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/548624?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/jgallimore";>jgallimore</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2536412?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/AndyGee";>AndyGee</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/58298?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/dain";>dain</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/62313?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/jaceklaskowski";>jaceklaskowski</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/13417392?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/rzo1";>rzo1</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/569822?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/djencks";>djencks</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/292938?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/cchacin";>cchacin</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/8139890?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/Daniel-Dos";>Daniel-Dos</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/5796305?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/radcortez";>radcortez</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/350841?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/danielsoro";>danielsoro</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/153299?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/mnour";>mnour</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/79310?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/struberg";>struberg</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/5103199?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/kmalhi";>kmalhi</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/863011?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/otaviojava";>otaviojava</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1454523?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/cesarhernandezgt";>cesarhernandezgt</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2318030?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/brunobat";>brunobat</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/796079?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/jgawor";>jgawor</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/696945?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/stratwine";>stratwine</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/6817157?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/j4fm";>j4fm</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/143997?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/cicekhayri";>cicekhayri</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/849502?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/emecas";>emecas</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/7131283?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/doychin";>doychin</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/643609?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/jgenender";>jgenender</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2260551?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/ivanjunckes";>ivanjunckes</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1392297?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/exabrial";>exabrial</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/34543311?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/Croway";>Croway</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/20850916?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/eapjunior";>eapjunior</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/4117683?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/gabrielbussolo";>gabrielbussolo</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/45101500?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/vrossellotravelc";>vrossellotravelc</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/5782559?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/sultan";>sultan</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2213741?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/BogdanStirbat";>BogdanStirbat</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/23589475?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/marcoantoniobferreira";>marcoantoniobferreira</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2485545?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/tandraschko";>tandraschko</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/43135961?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/SvetlinZarev-SAP";>SvetlinZarev-SAP</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2358940?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/josehenriqueventura";>josehenriqueventura</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/10781839?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/ShermanMarshall";>ShermanMarshall</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/13482727?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/dheffelfinger";>dheffelfinger</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/14073354?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/CristianDVN";>CristianDVN</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2665330?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/svenruppert";>svenruppert</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/10333974?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/cotnic";>cotnic</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/53859462?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/uncommon-design";>uncommon-design</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/8191965?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/alexferreiradev";>alexferreiradev</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1036090?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/sercheo87";>sercheo87</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/3828140?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/cassunde";>cassunde</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2397243?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/gdiazs";>gdiazs</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/105113209?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/tichovz";>tichovz</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/8331918?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/robinsonvs";>robinsonvs</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/8740736?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/jrxxjr";>jrxxjr</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/715370?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/yenerm";>yenerm</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/4043260?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/mpredli01";>mpredli01</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1370429?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/gerdogdu";>gerdogdu</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/13047948?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/dineshkumarg";>dineshkumarg</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/24616597?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/gacsnic";>gacsnic</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2016949?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/dalexandrov";>dalexandrov</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1426852?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/doobrie";>doobrie</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/664730?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/ivannov";>ivannov</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/287517?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/gmcdonald";>gmcdonald</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/16502032?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/puneethps";>puneethps</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/14115193?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/weverthon-medeiros";>weverthon-medeiros</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/10669557?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/nishantraut";>nishantraut</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/98899?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/whitlockjc";>whitlockjc</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/121002?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/juneau001";>juneau001</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/215651?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/carljmosca";>carljmosca</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/10210672?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/rhuan080";>rhuan080</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/24811669?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/pavelsmajda";>pavelsmajda</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/64927044?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/fredster33";>fredster33</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/4358449?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/bitcod3r";>bitcod3r</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/10050641?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/andradesampaio";>andradesampaio</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/28452503?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/G-Ork";>G-Ork</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/2968138?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/davidromero";>davidromero</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/279375?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/breakponchito";>breakponchito</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/28998445?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/ferdisn";>ferdisn</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1592273?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/rmpestano";>rmpestano</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/32864282?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/davidsalter";>davidsalter</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/20784387?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/patriciauz";>patriciauz</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/12471122?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/sendilkumarn";>sendilkumarn</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/49699333?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/dependabot[bot]";>dependabot[bot]</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/7410390?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/jchemile";>jchemile</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/51468684?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/javalenjara";>javalenjara</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/12963621?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/stklcode";>stklcode</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/233983?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/mayens";>mayens</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1341245?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/asfgit";>asfgit</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/78527112?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/Celebrate-future";>Celebrate-future</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/7319391?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/JuanMorenoDeveloper";>JuanMorenoDeveloper</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/255404?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/cbos";>cbos</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/57713725?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/Florian-Rau";>Florian-Rau</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/77732768?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/ikayacyangate";>ikayacyangate</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/99954?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/bdemers";>bdemers</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/6061000?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/Dexmaster";>Dexmaster</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1550937?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/stoxford";>stoxford</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/20473513?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/mawiesne";>mawiesne</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1366409?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a 
href="https://github.com/scriptmonkey";>scriptmonkey</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/1717144?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/sebfz1";>sebfz1</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/17863217?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/avermeer";>avermeer</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
-                  <div class="col-sm-4">
-                    <div class="photo col-sm-5">
-                      <img 
src="https://avatars.githubusercontent.com/u/6233921?v=4"; style="width:140px">
-                    </div>
-                    <div class="col-sm-7">
-                        <h5 class="contributor-name" 
style="font-size:1.0em;"><a href="https://github.com/mkienenb";>mkienenb</a></h5>
-                      <p></p>
-                    </div>
-                  </div>
-              
               </ul>
             </div>
         </div>
diff --git a/latest/javadoc/allclasses-frame.html 
b/latest/javadoc/allclasses-frame.html
index 7515bdcad..82192238b 100644
--- a/latest/javadoc/allclasses-frame.html
+++ b/latest/javadoc/allclasses-frame.html
@@ -114,6 +114,7 @@
 <li><a href="org/apache/openejb/jee/bval/AnnotationType.html" title="class in 
org.apache.openejb.jee.bval" target="classFrame">AnnotationType</a></li>
 <li><a href="org/apache/openejb/util/AnnotationUtil.html" title="class in 
org.apache.openejb.util" target="classFrame">AnnotationUtil</a></li>
 <li><a href="org/apache/openejb/jee/was/v6/xmi/Any.html" title="class in 
org.apache.openejb.jee.was.v6.xmi" target="classFrame">Any</a></li>
+<li><a href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi" target="classFrame">AppBeanManager</a></li>
 <li><a href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb" target="classFrame">AppContext</a></li>
 <li><a href="org/apache/openejb/config/AppContextConfigDeployer.html" 
title="class in org.apache.openejb.config" 
target="classFrame">AppContextConfigDeployer</a></li>
 <li><a href="org/apache/openejb/util/AppFinder.html" title="class in 
org.apache.openejb.util" target="classFrame">AppFinder</a></li>
@@ -168,6 +169,7 @@
 <li><a href="org/apache/openejb/testing/AppResource.html" title="annotation in 
org.apache.openejb.testing" target="classFrame">AppResource</a></li>
 <li><a href="org/apache/openejb/arquillian/embedded/AppResourceProducer.html" 
title="class in org.apache.openejb.arquillian.embedded" 
target="classFrame">AppResourceProducer</a></li>
 <li><a href="org/apache/openejb/config/AppValidator.html" title="class in 
org.apache.openejb.config" target="classFrame">AppValidator</a></li>
+<li><a href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi" target="classFrame">AppWebBeansContext</a></li>
 <li><a href="org/apache/tomee/bootstrap/Archive.html" title="class in 
org.apache.tomee.bootstrap" target="classFrame">Archive</a></li>
 <li><a href="org/apache/ziplock/Archive.html" title="class in 
org.apache.ziplock" target="classFrame">Archive</a></li>
 <li><a href="org/apache/openejb/loader/provisining/ArchiveResolver.html" 
title="interface in org.apache.openejb.loader.provisining" 
target="classFrame"><span class="interfaceName">ArchiveResolver</span></a></li>
diff --git a/latest/javadoc/allclasses-noframe.html 
b/latest/javadoc/allclasses-noframe.html
index 5662b06fa..c410ff2f4 100644
--- a/latest/javadoc/allclasses-noframe.html
+++ b/latest/javadoc/allclasses-noframe.html
@@ -114,6 +114,7 @@
 <li><a href="org/apache/openejb/jee/bval/AnnotationType.html" title="class in 
org.apache.openejb.jee.bval">AnnotationType</a></li>
 <li><a href="org/apache/openejb/util/AnnotationUtil.html" title="class in 
org.apache.openejb.util">AnnotationUtil</a></li>
 <li><a href="org/apache/openejb/jee/was/v6/xmi/Any.html" title="class in 
org.apache.openejb.jee.was.v6.xmi">Any</a></li>
+<li><a href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi">AppBeanManager</a></li>
 <li><a href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb">AppContext</a></li>
 <li><a href="org/apache/openejb/config/AppContextConfigDeployer.html" 
title="class in org.apache.openejb.config">AppContextConfigDeployer</a></li>
 <li><a href="org/apache/openejb/util/AppFinder.html" title="class in 
org.apache.openejb.util">AppFinder</a></li>
@@ -168,6 +169,7 @@
 <li><a href="org/apache/openejb/testing/AppResource.html" title="annotation in 
org.apache.openejb.testing">AppResource</a></li>
 <li><a href="org/apache/openejb/arquillian/embedded/AppResourceProducer.html" 
title="class in 
org.apache.openejb.arquillian.embedded">AppResourceProducer</a></li>
 <li><a href="org/apache/openejb/config/AppValidator.html" title="class in 
org.apache.openejb.config">AppValidator</a></li>
+<li><a href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi">AppWebBeansContext</a></li>
 <li><a href="org/apache/tomee/bootstrap/Archive.html" title="class in 
org.apache.tomee.bootstrap">Archive</a></li>
 <li><a href="org/apache/ziplock/Archive.html" title="class in 
org.apache.ziplock">Archive</a></li>
 <li><a href="org/apache/openejb/loader/provisining/ArchiveResolver.html" 
title="interface in org.apache.openejb.loader.provisining"><span 
class="interfaceName">ArchiveResolver</span></a></li>
diff --git a/latest/javadoc/index-all.html b/latest/javadoc/index-all.html
index 76c21a847..87c86b126 100644
--- a/latest/javadoc/index-all.html
+++ b/latest/javadoc/index-all.html
@@ -1955,6 +1955,10 @@
 </dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/tomee/util/QuickServerXmlParser.html#appBase--">appBase()</a></span>
 - Method in class org.apache.tomee.util.<a 
href="org/apache/tomee/util/QuickServerXmlParser.html" title="class in 
org.apache.tomee.util">QuickServerXmlParser</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi"><span class="typeNameLink">AppBeanManager</span></a> - 
Class in <a 
href="org/apache/openejb/cdi/package-summary.html">org.apache.openejb.cdi</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/AppBeanManager.html#AppBeanManager-WebBeansContext-">AppBeanManager(WebBeansContext)</a></span>
 - Constructor for class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi">AppBeanManager</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb"><span class="typeNameLink">AppContext</span></a> - Class in 
<a href="org/apache/openejb/package-summary.html">org.apache.openejb</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/AppContext.html#AppContext-java.lang.String-org.apache.openejb.loader.SystemInstance-java.lang.ClassLoader-javax.naming.Context-javax.naming.Context-boolean-">AppContext(String,
 SystemInstance, ClassLoader, Context, Context, boolean)</a></span> - 
Constructor for class org.apache.openejb.<a 
href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb">AppContext</a></dt>
@@ -2325,6 +2329,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/config/AppValidator.html#AppValidator-org.apache.openejb.config.rules.ValidationBase...-">AppValidator(ValidationBase...)</a></span>
 - Constructor for class org.apache.openejb.config.<a 
href="org/apache/openejb/config/AppValidator.html" title="class in 
org.apache.openejb.config">AppValidator</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppWebBeansContext</span></a> - Class in <a 
href="org/apache/openejb/cdi/package-summary.html">org.apache.openejb.cdi</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/AppWebBeansContext.html#AppWebBeansContext-java.util.Map-java.util.Properties-">AppWebBeansContext(Map&lt;Class&lt;?&gt;,
 Object&gt;, Properties)</a></span> - Constructor for class 
org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi">AppWebBeansContext</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/arquillian/common/TomEEConfiguration.html#appWorkingDir">appWorkingDir</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/config/ConfigurableClasspathArchive.html#archive-org.apache.openejb.config.Module-java.lang.Iterable-boolean-">archive(Module,
 Iterable&lt;URL&gt;, boolean)</a></span> - Static method in class 
org.apache.openejb.config.<a 
href="org/apache/openejb/config/ConfigurableClasspathArchive.html" title="class 
in org.apache.openejb.config">ConfigurableClasspathArchive</a></dt>
@@ -21123,6 +21131,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/OpenEJBLifecycle.html#getBeanManager--">getBeanManager()</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/cdi/AppWebBeansContext.html#getBeanManagerImpl--">getBeanManagerImpl()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi">AppWebBeansContext</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html#getBeanManagerImpl--">getBeanManagerImpl()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html" title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/jee/InitMethod.html#getBeanMethod--">getBeanMethod()</a></span>
 - Method in class org.apache.openejb.jee.<a 
href="org/apache/openejb/jee/InitMethod.html" title="class in 
org.apache.openejb.jee">InitMethod</a></dt>
@@ -29815,6 +29825,8 @@
 <dd>
 <div class="block">Gets the value of the initSuspendSeconds property.</div>
 </dd>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/AppWebBeansContext.html#getInjectableBeanManager--">getInjectableBeanManager()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi">AppWebBeansContext</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html#getInjectableBeanManager--">getInjectableBeanManager()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html" title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebappBeanManager.html#getInjectableReference-InjectionPoint--">getInjectableReference(InjectionPoint,
 &lt;any&gt;)</a></span> - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappBeanManager.html" title="class in 
org.apache.openejb.cdi">WebappBeanManager</a></dt>
@@ -86047,7 +86059,7 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/cdi/WebAppInjectionResolver.html" title="class 
in org.apache.openejb.cdi"><span 
class="typeNameLink">WebAppInjectionResolver</span></a> - Class in <a 
href="org/apache/openejb/cdi/package-summary.html">org.apache.openejb.cdi</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">WebAppInjectionResolver(WebappWebBeansContext)</a></span>
 - Constructor for class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html" title="class in 
org.apache.openejb.cdi">WebAppInjectionResolver</a></dt>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-WebBeansContext-">WebAppInjectionResolver(WebBeansContext)</a></span>
 - Constructor for class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html" title="class in 
org.apache.openejb.cdi">WebAppInjectionResolver</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/assembler/classic/PersistenceUnitInfo.html#webappName">webappName</a></span>
 - Variable in class org.apache.openejb.assembler.classic.<a 
href="org/apache/openejb/assembler/classic/PersistenceUnitInfo.html" 
title="class in 
org.apache.openejb.assembler.classic">PersistenceUnitInfo</a></dt>
 <dd>&nbsp;</dd>
diff --git a/latest/javadoc/org/apache/openejb/cdi/AppBeanManager.html 
b/latest/javadoc/org/apache/openejb/cdi/AppBeanManager.html
new file mode 100644
index 000000000..4a2ff2034
--- /dev/null
+++ b/latest/javadoc/org/apache/openejb/cdi/AppBeanManager.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<title>AppBeanManager</title>
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+
+<link rel="shortcut icon" href="/favicon.png">
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AppBeanManager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppBeanManager.html" 
target="_top">Frames</a></li>
+<li><a href="AppBeanManager.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>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.openejb.cdi</div>
+<h2 title="Class AppBeanManager" class="title">Class AppBeanManager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>BeanManagerImpl</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.openejb.cdi.AppBeanManager</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AppBeanManager</span>
+extends BeanManagerImpl</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.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>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppBeanManager.html#AppBeanManager-WebBeansContext-">AppBeanManager</a></span>(WebBeansContext&nbsp;ctx)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<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>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AppBeanManager-WebBeansContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AppBeanManager</h4>
+<pre>public&nbsp;AppBeanManager(WebBeansContext&nbsp;ctx)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppBeanManager.html" 
target="_top">Frames</a></li>
+<li><a href="AppBeanManager.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>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html 
b/latest/javadoc/org/apache/openejb/cdi/AppWebBeansContext.html
similarity index 62%
copy from latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
copy to latest/javadoc/org/apache/openejb/cdi/AppWebBeansContext.html
index c7ea0554e..41858afd7 100644
--- a/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
+++ b/latest/javadoc/org/apache/openejb/cdi/AppWebBeansContext.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>WebAppInjectionResolver</title>
+<title>AppWebBeansContext</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WebAppInjectionResolver";
+            parent.document.title="AppWebBeansContext";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/openejb/cdi/WebAppElResolver.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../org/apache/openejb/cdi/WebappNotificationManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/AppBeanManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/CdiAppContextsService.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a 
href="../../../../index.html?org/apache/openejb/cdi/WebAppInjectionResolver.html"
 target="_top">Frames</a></li>
-<li><a href="WebAppInjectionResolver.html" 
target="_top">No&nbsp;Frames</a></li>
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppWebBeansContext.html" 
target="_top">Frames</a></li>
+<li><a href="AppWebBeansContext.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,17 +92,17 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.openejb.cdi</div>
-<h2 title="Class WebAppInjectionResolver" class="title">Class 
WebAppInjectionResolver</h2>
+<h2 title="Class AppWebBeansContext" class="title">Class 
AppWebBeansContext</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>InjectionResolver</li>
+<li>WebBeansContext</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.openejb.cdi.WebAppInjectionResolver</li>
+<li>org.apache.openejb.cdi.AppWebBeansContext</li>
 </ul>
 </li>
 </ul>
@@ -113,8 +113,8 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">WebAppInjectionResolver</span>
-extends InjectionResolver</pre>
+<pre>public class <span class="typeNameLabel">AppWebBeansContext</span>
+extends WebBeansContext</pre>
 </li>
 </ul>
 </div>
@@ -133,7 +133,8 @@ extends InjectionResolver</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/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">WebAppInjectionResolver</a></span>(<a
 href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html#AppWebBeansContext-java.util.Map-java.util.Properties-">AppWebBeansContext</a></span>(java.util.Map&lt;java.lang.Class&lt;?&gt;,java.lang.Object&gt;&nbsp;services,
+                  java.util.Properties&nbsp;properties)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,23 +152,12 @@ extends InjectionResolver</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/openejb/cdi/WebAppInjectionResolver.html#clearCaches--">clearCaches</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>BeanManagerImpl</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html#getBeanManagerImpl--">getBeanManagerImpl</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#getCacheSize--">getCacheSize</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>java.util.Set&lt;&lt;any&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#implResolveByType-boolean-java.lang.reflect.Type-java.lang.Class-java.lang.annotation.Annotation...-">implResolveByType</a></span>(boolean&nbsp;delegate,
-                 java.lang.reflect.Type&nbsp;injectionPointType,
-                 java.lang.Class&lt;?&gt;&nbsp;injectionPointClass,
-                 
java.lang.annotation.Annotation...&nbsp;qualifiers)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#setStartup-boolean-">setStartup</a></span>(boolean&nbsp;startup)</code>&nbsp;</td>
+<td class="colFirst"><code>InjectableBeanManager</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html#getInjectableBeanManager--">getInjectableBeanManager</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -191,13 +181,14 @@ extends InjectionResolver</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">
+<a name="AppWebBeansContext-java.util.Map-java.util.Properties-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>WebAppInjectionResolver</h4>
-<pre>public&nbsp;WebAppInjectionResolver(<a 
href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</pre>
+<h4>AppWebBeansContext</h4>
+<pre>public&nbsp;AppWebBeansContext(java.util.Map&lt;java.lang.Class&lt;?&gt;,java.lang.Object&gt;&nbsp;services,
+                          java.util.Properties&nbsp;properties)</pre>
 </li>
 </ul>
 </li>
@@ -208,43 +199,22 @@ extends InjectionResolver</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a 
name="implResolveByType-boolean-java.lang.reflect.Type-java.lang.Class-java.lang.annotation.Annotation...-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>implResolveByType</h4>
-<pre>public&nbsp;java.util.Set&lt;&lt;any&gt;&gt;&nbsp;implResolveByType(boolean&nbsp;delegate,
-                                              
java.lang.reflect.Type&nbsp;injectionPointType,
-                                              
java.lang.Class&lt;?&gt;&nbsp;injectionPointClass,
-                                              
java.lang.annotation.Annotation...&nbsp;qualifiers)</pre>
-</li>
-</ul>
-<a name="setStartup-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setStartup</h4>
-<pre>public&nbsp;void&nbsp;setStartup(boolean&nbsp;startup)</pre>
-</li>
-</ul>
-<a name="clearCaches--">
+<a name="getInjectableBeanManager--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>clearCaches</h4>
-<pre>public&nbsp;void&nbsp;clearCaches()</pre>
+<h4>getInjectableBeanManager</h4>
+<pre>public&nbsp;InjectableBeanManager&nbsp;getInjectableBeanManager()</pre>
 </li>
 </ul>
-<a name="getCacheSize--">
+<a name="getBeanManagerImpl--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getCacheSize</h4>
-<pre>public&nbsp;int&nbsp;getCacheSize()</pre>
+<h4>getBeanManagerImpl</h4>
+<pre>public&nbsp;BeanManagerImpl&nbsp;getBeanManagerImpl()</pre>
 </li>
 </ul>
 </li>
@@ -274,12 +244,12 @@ extends InjectionResolver</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/openejb/cdi/WebAppElResolver.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../org/apache/openejb/cdi/WebappNotificationManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/AppBeanManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/CdiAppContextsService.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a 
href="../../../../index.html?org/apache/openejb/cdi/WebAppInjectionResolver.html"
 target="_top">Frames</a></li>
-<li><a href="WebAppInjectionResolver.html" 
target="_top">No&nbsp;Frames</a></li>
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppWebBeansContext.html" 
target="_top">Frames</a></li>
+<li><a href="AppWebBeansContext.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/latest/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html 
b/latest/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html
index 26453ee00..f85fc5da7 100644
--- a/latest/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html
+++ b/latest/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a 
href="../../../../org/apache/openejb/cdi/CdiAppContextsService.FiredManually.html"
 title="interface in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -349,7 +349,7 @@ extends WebContextsService</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a 
href="../../../../org/apache/openejb/cdi/CdiAppContextsService.FiredManually.html"
 title="interface in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html 
b/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
index c7ea0554e..6dee42919 100644
--- a/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
+++ b/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
@@ -133,7 +133,7 @@ extends InjectionResolver</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/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">WebAppInjectionResolver</a></span>(<a
 href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-WebBeansContext-">WebAppInjectionResolver</a></span>(WebBeansContext&nbsp;ctx)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -191,13 +191,13 @@ extends InjectionResolver</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">
+<a name="WebAppInjectionResolver-WebBeansContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WebAppInjectionResolver</h4>
-<pre>public&nbsp;WebAppInjectionResolver(<a 
href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</pre>
+<pre>public&nbsp;WebAppInjectionResolver(WebBeansContext&nbsp;ctx)</pre>
 </li>
 </ul>
 </li>
diff --git a/latest/javadoc/org/apache/openejb/cdi/package-frame.html 
b/latest/javadoc/org/apache/openejb/cdi/package-frame.html
index 77af8ba8c..4e44ebdb3 100644
--- a/latest/javadoc/org/apache/openejb/cdi/package-frame.html
+++ b/latest/javadoc/org/apache/openejb/cdi/package-frame.html
@@ -18,6 +18,8 @@
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="AppBeanManager.html" title="class in org.apache.openejb.cdi" 
target="classFrame">AppBeanManager</a></li>
+<li><a href="AppWebBeansContext.html" title="class in org.apache.openejb.cdi" 
target="classFrame">AppWebBeansContext</a></li>
 <li><a href="CdiAppContextsService.html" title="class in 
org.apache.openejb.cdi" target="classFrame">CdiAppContextsService</a></li>
 <li><a href="CdiBeanInfo.html" title="class in org.apache.openejb.cdi" 
target="classFrame">CdiBeanInfo</a></li>
 <li><a href="CdiBuilder.html" title="class in org.apache.openejb.cdi" 
target="classFrame">CdiBuilder</a></li>
diff --git a/latest/javadoc/org/apache/openejb/cdi/package-summary.html 
b/latest/javadoc/org/apache/openejb/cdi/package-summary.html
index 7a208f58b..bc542d133 100644
--- a/latest/javadoc/org/apache/openejb/cdi/package-summary.html
+++ b/latest/javadoc/org/apache/openejb/cdi/package-summary.html
@@ -101,6 +101,14 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi">AppBeanManager</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" title="class 
in org.apache.openejb.cdi">AppWebBeansContext</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/openejb/cdi/CdiAppContextsService.html" 
title="class in org.apache.openejb.cdi">CdiAppContextsService</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/latest/javadoc/org/apache/openejb/cdi/package-tree.html 
b/latest/javadoc/org/apache/openejb/cdi/package-tree.html
index 03d1e9871..c6424d461 100644
--- a/latest/javadoc/org/apache/openejb/cdi/package-tree.html
+++ b/latest/javadoc/org/apache/openejb/cdi/package-tree.html
@@ -109,6 +109,11 @@
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/WebappBeanManager.html" title="class 
in org.apache.openejb.cdi"><span 
class="typeNameLink">WebappBeanManager</span></a></li>
 </ul>
 </li>
+<li type="circle">BeanManagerImpl
+<ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppBeanManager</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.openejb.jee.<a 
href="../../../../org/apache/openejb/jee/Beans.html" title="class in 
org.apache.openejb.jee"><span class="typeNameLink">Beans</span></a>
 <ul>
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/CompositeBeans.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">CompositeBeans</span></a></li>
@@ -151,6 +156,11 @@
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/ThreadSingletonServiceImpl.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">ThreadSingletonServiceImpl</span></a> (implements 
org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/ThreadSingletonService.html" 
title="interface in org.apache.openejb.cdi">ThreadSingletonService</a>)</li>
 <li type="circle">WebBeansContext
 <ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" title="class 
in org.apache.openejb.cdi"><span 
class="typeNameLink">AppWebBeansContext</span></a></li>
+</ul>
+</li>
+<li type="circle">WebBeansContext
+<ul>
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">WebappWebBeansContext</span></a></li>
 </ul>
 </li>
diff --git a/latest/javadoc/overview-tree.html 
b/latest/javadoc/overview-tree.html
index 457ba8439..e5908ce26 100644
--- a/latest/javadoc/overview-tree.html
+++ b/latest/javadoc/overview-tree.html
@@ -1341,6 +1341,11 @@
 <li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappBeanManager.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">WebappBeanManager</span></a></li>
 </ul>
 </li>
+<li type="circle">BeanManagerImpl
+<ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppBeanManager</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.openejb.jee.sun.<a 
href="org/apache/openejb/jee/sun/BeanPool.html" title="class in 
org.apache.openejb.jee.sun"><span class="typeNameLink">BeanPool</span></a></li>
 <li type="circle">org.apache.openejb.config.<a 
href="org/apache/openejb/config/BeanProperties.html" title="class in 
org.apache.openejb.config"><span class="typeNameLink">BeanProperties</span></a> 
(implements org.apache.openejb.config.<a 
href="org/apache/openejb/config/DynamicDeployer.html" title="interface in 
org.apache.openejb.config">DynamicDeployer</a>)</li>
 <li type="circle">org.apache.openejb.jee.<a 
href="org/apache/openejb/jee/Beans.html" title="class in 
org.apache.openejb.jee"><span class="typeNameLink">Beans</span></a>
@@ -4873,6 +4878,11 @@
 <li type="circle">org.apache.openejb.arquillian.openejb.http.<a 
href="org/apache/openejb/arquillian/openejb/http/WebArchiveResourceProvider.html"
 title="class in org.apache.openejb.arquillian.openejb.http"><span 
class="typeNameLink">WebArchiveResourceProvider</span></a> (implements 
org.apache.openejb.server.httpd.<a 
href="org/apache/openejb/server/httpd/EmbeddedServletContext.ResourceProvider.html"
 title="interface in 
org.apache.openejb.server.httpd">EmbeddedServletContext.ResourceProvid [...]
 <li type="circle">WebBeansContext
 <ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppWebBeansContext</span></a></li>
+</ul>
+</li>
+<li type="circle">WebBeansContext
+<ul>
 <li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">WebappWebBeansContext</span></a></li>
 </ul>
 </li>
diff --git a/tomee-9.0/javadoc/allclasses-frame.html 
b/tomee-9.0/javadoc/allclasses-frame.html
index 5db525b65..1f296f946 100644
--- a/tomee-9.0/javadoc/allclasses-frame.html
+++ b/tomee-9.0/javadoc/allclasses-frame.html
@@ -114,6 +114,7 @@
 <li><a href="org/apache/openejb/jee/bval/AnnotationType.html" title="class in 
org.apache.openejb.jee.bval" target="classFrame">AnnotationType</a></li>
 <li><a href="org/apache/openejb/util/AnnotationUtil.html" title="class in 
org.apache.openejb.util" target="classFrame">AnnotationUtil</a></li>
 <li><a href="org/apache/openejb/jee/was/v6/xmi/Any.html" title="class in 
org.apache.openejb.jee.was.v6.xmi" target="classFrame">Any</a></li>
+<li><a href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi" target="classFrame">AppBeanManager</a></li>
 <li><a href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb" target="classFrame">AppContext</a></li>
 <li><a href="org/apache/openejb/config/AppContextConfigDeployer.html" 
title="class in org.apache.openejb.config" 
target="classFrame">AppContextConfigDeployer</a></li>
 <li><a href="org/apache/openejb/util/AppFinder.html" title="class in 
org.apache.openejb.util" target="classFrame">AppFinder</a></li>
@@ -168,6 +169,7 @@
 <li><a href="org/apache/openejb/testing/AppResource.html" title="annotation in 
org.apache.openejb.testing" target="classFrame">AppResource</a></li>
 <li><a href="org/apache/openejb/arquillian/embedded/AppResourceProducer.html" 
title="class in org.apache.openejb.arquillian.embedded" 
target="classFrame">AppResourceProducer</a></li>
 <li><a href="org/apache/openejb/config/AppValidator.html" title="class in 
org.apache.openejb.config" target="classFrame">AppValidator</a></li>
+<li><a href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi" target="classFrame">AppWebBeansContext</a></li>
 <li><a href="org/apache/tomee/bootstrap/Archive.html" title="class in 
org.apache.tomee.bootstrap" target="classFrame">Archive</a></li>
 <li><a href="org/apache/openejb/loader/provisining/ArchiveResolver.html" 
title="interface in org.apache.openejb.loader.provisining" 
target="classFrame"><span class="interfaceName">ArchiveResolver</span></a></li>
 <li><a 
href="org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.html"
 title="class in org.apache.openejb.arquillian.openejb.cucumber" 
target="classFrame">ArchiveResourceIteratorFactory</a></li>
diff --git a/tomee-9.0/javadoc/allclasses-noframe.html 
b/tomee-9.0/javadoc/allclasses-noframe.html
index 5755a543c..ad619c212 100644
--- a/tomee-9.0/javadoc/allclasses-noframe.html
+++ b/tomee-9.0/javadoc/allclasses-noframe.html
@@ -114,6 +114,7 @@
 <li><a href="org/apache/openejb/jee/bval/AnnotationType.html" title="class in 
org.apache.openejb.jee.bval">AnnotationType</a></li>
 <li><a href="org/apache/openejb/util/AnnotationUtil.html" title="class in 
org.apache.openejb.util">AnnotationUtil</a></li>
 <li><a href="org/apache/openejb/jee/was/v6/xmi/Any.html" title="class in 
org.apache.openejb.jee.was.v6.xmi">Any</a></li>
+<li><a href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi">AppBeanManager</a></li>
 <li><a href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb">AppContext</a></li>
 <li><a href="org/apache/openejb/config/AppContextConfigDeployer.html" 
title="class in org.apache.openejb.config">AppContextConfigDeployer</a></li>
 <li><a href="org/apache/openejb/util/AppFinder.html" title="class in 
org.apache.openejb.util">AppFinder</a></li>
@@ -168,6 +169,7 @@
 <li><a href="org/apache/openejb/testing/AppResource.html" title="annotation in 
org.apache.openejb.testing">AppResource</a></li>
 <li><a href="org/apache/openejb/arquillian/embedded/AppResourceProducer.html" 
title="class in 
org.apache.openejb.arquillian.embedded">AppResourceProducer</a></li>
 <li><a href="org/apache/openejb/config/AppValidator.html" title="class in 
org.apache.openejb.config">AppValidator</a></li>
+<li><a href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi">AppWebBeansContext</a></li>
 <li><a href="org/apache/tomee/bootstrap/Archive.html" title="class in 
org.apache.tomee.bootstrap">Archive</a></li>
 <li><a href="org/apache/openejb/loader/provisining/ArchiveResolver.html" 
title="interface in org.apache.openejb.loader.provisining"><span 
class="interfaceName">ArchiveResolver</span></a></li>
 <li><a 
href="org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.html"
 title="class in 
org.apache.openejb.arquillian.openejb.cucumber">ArchiveResourceIteratorFactory</a></li>
diff --git a/tomee-9.0/javadoc/index-all.html b/tomee-9.0/javadoc/index-all.html
index c285bef35..02ea29fa7 100644
--- a/tomee-9.0/javadoc/index-all.html
+++ b/tomee-9.0/javadoc/index-all.html
@@ -1947,6 +1947,10 @@
 </dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/tomee/util/QuickServerXmlParser.html#appBase--">appBase()</a></span>
 - Method in class org.apache.tomee.util.<a 
href="org/apache/tomee/util/QuickServerXmlParser.html" title="class in 
org.apache.tomee.util">QuickServerXmlParser</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi"><span class="typeNameLink">AppBeanManager</span></a> - 
Class in <a 
href="org/apache/openejb/cdi/package-summary.html">org.apache.openejb.cdi</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/AppBeanManager.html#AppBeanManager-WebBeansContext-">AppBeanManager(WebBeansContext)</a></span>
 - Constructor for class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi">AppBeanManager</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb"><span class="typeNameLink">AppContext</span></a> - Class in 
<a href="org/apache/openejb/package-summary.html">org.apache.openejb</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/AppContext.html#AppContext-java.lang.String-org.apache.openejb.loader.SystemInstance-java.lang.ClassLoader-javax.naming.Context-javax.naming.Context-boolean-">AppContext(String,
 SystemInstance, ClassLoader, Context, Context, boolean)</a></span> - 
Constructor for class org.apache.openejb.<a 
href="org/apache/openejb/AppContext.html" title="class in 
org.apache.openejb">AppContext</a></dt>
@@ -2315,6 +2319,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/config/AppValidator.html#AppValidator-org.apache.openejb.config.rules.ValidationBase...-">AppValidator(ValidationBase...)</a></span>
 - Constructor for class org.apache.openejb.config.<a 
href="org/apache/openejb/config/AppValidator.html" title="class in 
org.apache.openejb.config">AppValidator</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppWebBeansContext</span></a> - Class in <a 
href="org/apache/openejb/cdi/package-summary.html">org.apache.openejb.cdi</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/AppWebBeansContext.html#AppWebBeansContext-java.util.Map-java.util.Properties-">AppWebBeansContext(Map&lt;Class&lt;?&gt;,
 Object&gt;, Properties)</a></span> - Constructor for class 
org.apache.openejb.cdi.<a href="org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi">AppWebBeansContext</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/arquillian/common/TomEEConfiguration.html#appWorkingDir">appWorkingDir</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/config/ConfigurableClasspathArchive.html#archive-org.apache.openejb.config.Module-java.lang.Iterable-boolean-">archive(Module,
 Iterable&lt;URL&gt;, boolean)</a></span> - Static method in class 
org.apache.openejb.config.<a 
href="org/apache/openejb/config/ConfigurableClasspathArchive.html" title="class 
in org.apache.openejb.config">ConfigurableClasspathArchive</a></dt>
@@ -20937,6 +20945,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/OpenEJBLifecycle.html#getBeanManager--">getBeanManager()</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/cdi/AppWebBeansContext.html#getBeanManagerImpl--">getBeanManagerImpl()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi">AppWebBeansContext</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html#getBeanManagerImpl--">getBeanManagerImpl()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html" title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/jee/InitMethod.html#getBeanMethod--">getBeanMethod()</a></span>
 - Method in class org.apache.openejb.jee.<a 
href="org/apache/openejb/jee/InitMethod.html" title="class in 
org.apache.openejb.jee">InitMethod</a></dt>
@@ -29629,6 +29639,8 @@
 <dd>
 <div class="block">Gets the value of the initSuspendSeconds property.</div>
 </dd>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/AppWebBeansContext.html#getInjectableBeanManager--">getInjectableBeanManager()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi">AppWebBeansContext</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html#getInjectableBeanManager--">getInjectableBeanManager()</a></span>
 - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html" title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebappBeanManager.html#getInjectableReference-InjectionPoint--">getInjectableReference(InjectionPoint,
 &lt;any&gt;)</a></span> - Method in class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappBeanManager.html" title="class in 
org.apache.openejb.cdi">WebappBeanManager</a></dt>
@@ -85563,7 +85575,7 @@ the order they are declared.</div>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/openejb/cdi/WebAppInjectionResolver.html" title="class 
in org.apache.openejb.cdi"><span 
class="typeNameLink">WebAppInjectionResolver</span></a> - Class in <a 
href="org/apache/openejb/cdi/package-summary.html">org.apache.openejb.cdi</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">WebAppInjectionResolver(WebappWebBeansContext)</a></span>
 - Constructor for class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html" title="class in 
org.apache.openejb.cdi">WebAppInjectionResolver</a></dt>
+<dt><span class="memberNameLink"><a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-WebBeansContext-">WebAppInjectionResolver(WebBeansContext)</a></span>
 - Constructor for class org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebAppInjectionResolver.html" title="class in 
org.apache.openejb.cdi">WebAppInjectionResolver</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a 
href="org/apache/openejb/assembler/classic/PersistenceUnitInfo.html#webappName">webappName</a></span>
 - Variable in class org.apache.openejb.assembler.classic.<a 
href="org/apache/openejb/assembler/classic/PersistenceUnitInfo.html" 
title="class in 
org.apache.openejb.assembler.classic">PersistenceUnitInfo</a></dt>
 <dd>&nbsp;</dd>
diff --git a/tomee-9.0/javadoc/org/apache/openejb/cdi/AppBeanManager.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/AppBeanManager.html
new file mode 100644
index 000000000..4a2ff2034
--- /dev/null
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/AppBeanManager.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<title>AppBeanManager</title>
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+
+<link rel="shortcut icon" href="/favicon.png">
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AppBeanManager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppBeanManager.html" 
target="_top">Frames</a></li>
+<li><a href="AppBeanManager.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>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.openejb.cdi</div>
+<h2 title="Class AppBeanManager" class="title">Class AppBeanManager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>BeanManagerImpl</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.openejb.cdi.AppBeanManager</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AppBeanManager</span>
+extends BeanManagerImpl</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.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>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppBeanManager.html#AppBeanManager-WebBeansContext-">AppBeanManager</a></span>(WebBeansContext&nbsp;ctx)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<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>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AppBeanManager-WebBeansContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AppBeanManager</h4>
+<pre>public&nbsp;AppBeanManager(WebBeansContext&nbsp;ctx)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppBeanManager.html" 
target="_top">Frames</a></li>
+<li><a href="AppBeanManager.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>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/AppWebBeansContext.html
similarity index 62%
copy from latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
copy to tomee-9.0/javadoc/org/apache/openejb/cdi/AppWebBeansContext.html
index c7ea0554e..41858afd7 100644
--- a/latest/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/AppWebBeansContext.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<title>WebAppInjectionResolver</title>
+<title>AppWebBeansContext</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WebAppInjectionResolver";
+            parent.document.title="AppWebBeansContext";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,12 +48,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/openejb/cdi/WebAppElResolver.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../org/apache/openejb/cdi/WebappNotificationManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/AppBeanManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/CdiAppContextsService.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a 
href="../../../../index.html?org/apache/openejb/cdi/WebAppInjectionResolver.html"
 target="_top">Frames</a></li>
-<li><a href="WebAppInjectionResolver.html" 
target="_top">No&nbsp;Frames</a></li>
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppWebBeansContext.html" 
target="_top">Frames</a></li>
+<li><a href="AppWebBeansContext.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,17 +92,17 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.openejb.cdi</div>
-<h2 title="Class WebAppInjectionResolver" class="title">Class 
WebAppInjectionResolver</h2>
+<h2 title="Class AppWebBeansContext" class="title">Class 
AppWebBeansContext</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>InjectionResolver</li>
+<li>WebBeansContext</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.openejb.cdi.WebAppInjectionResolver</li>
+<li>org.apache.openejb.cdi.AppWebBeansContext</li>
 </ul>
 </li>
 </ul>
@@ -113,8 +113,8 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">WebAppInjectionResolver</span>
-extends InjectionResolver</pre>
+<pre>public class <span class="typeNameLabel">AppWebBeansContext</span>
+extends WebBeansContext</pre>
 </li>
 </ul>
 </div>
@@ -133,7 +133,8 @@ extends InjectionResolver</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/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">WebAppInjectionResolver</a></span>(<a
 href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html#AppWebBeansContext-java.util.Map-java.util.Properties-">AppWebBeansContext</a></span>(java.util.Map&lt;java.lang.Class&lt;?&gt;,java.lang.Object&gt;&nbsp;services,
+                  java.util.Properties&nbsp;properties)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -151,23 +152,12 @@ extends InjectionResolver</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/openejb/cdi/WebAppInjectionResolver.html#clearCaches--">clearCaches</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>BeanManagerImpl</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html#getBeanManagerImpl--">getBeanManagerImpl</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#getCacheSize--">getCacheSize</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>java.util.Set&lt;&lt;any&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#implResolveByType-boolean-java.lang.reflect.Type-java.lang.Class-java.lang.annotation.Annotation...-">implResolveByType</a></span>(boolean&nbsp;delegate,
-                 java.lang.reflect.Type&nbsp;injectionPointType,
-                 java.lang.Class&lt;?&gt;&nbsp;injectionPointClass,
-                 
java.lang.annotation.Annotation...&nbsp;qualifiers)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#setStartup-boolean-">setStartup</a></span>(boolean&nbsp;startup)</code>&nbsp;</td>
+<td class="colFirst"><code>InjectableBeanManager</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html#getInjectableBeanManager--">getInjectableBeanManager</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -191,13 +181,14 @@ extends InjectionResolver</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">
+<a name="AppWebBeansContext-java.util.Map-java.util.Properties-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>WebAppInjectionResolver</h4>
-<pre>public&nbsp;WebAppInjectionResolver(<a 
href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</pre>
+<h4>AppWebBeansContext</h4>
+<pre>public&nbsp;AppWebBeansContext(java.util.Map&lt;java.lang.Class&lt;?&gt;,java.lang.Object&gt;&nbsp;services,
+                          java.util.Properties&nbsp;properties)</pre>
 </li>
 </ul>
 </li>
@@ -208,43 +199,22 @@ extends InjectionResolver</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a 
name="implResolveByType-boolean-java.lang.reflect.Type-java.lang.Class-java.lang.annotation.Annotation...-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>implResolveByType</h4>
-<pre>public&nbsp;java.util.Set&lt;&lt;any&gt;&gt;&nbsp;implResolveByType(boolean&nbsp;delegate,
-                                              
java.lang.reflect.Type&nbsp;injectionPointType,
-                                              
java.lang.Class&lt;?&gt;&nbsp;injectionPointClass,
-                                              
java.lang.annotation.Annotation...&nbsp;qualifiers)</pre>
-</li>
-</ul>
-<a name="setStartup-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setStartup</h4>
-<pre>public&nbsp;void&nbsp;setStartup(boolean&nbsp;startup)</pre>
-</li>
-</ul>
-<a name="clearCaches--">
+<a name="getInjectableBeanManager--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>clearCaches</h4>
-<pre>public&nbsp;void&nbsp;clearCaches()</pre>
+<h4>getInjectableBeanManager</h4>
+<pre>public&nbsp;InjectableBeanManager&nbsp;getInjectableBeanManager()</pre>
 </li>
 </ul>
-<a name="getCacheSize--">
+<a name="getBeanManagerImpl--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getCacheSize</h4>
-<pre>public&nbsp;int&nbsp;getCacheSize()</pre>
+<h4>getBeanManagerImpl</h4>
+<pre>public&nbsp;BeanManagerImpl&nbsp;getBeanManagerImpl()</pre>
 </li>
 </ul>
 </li>
@@ -274,12 +244,12 @@ extends InjectionResolver</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/openejb/cdi/WebAppElResolver.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a 
href="../../../../org/apache/openejb/cdi/WebappNotificationManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/AppBeanManager.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/openejb/cdi/CdiAppContextsService.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a 
href="../../../../index.html?org/apache/openejb/cdi/WebAppInjectionResolver.html"
 target="_top">Frames</a></li>
-<li><a href="WebAppInjectionResolver.html" 
target="_top">No&nbsp;Frames</a></li>
+<li><a 
href="../../../../index.html?org/apache/openejb/cdi/AppWebBeansContext.html" 
target="_top">Frames</a></li>
+<li><a href="AppWebBeansContext.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-9.0/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html
index 26453ee00..f85fc5da7 100644
--- a/tomee-9.0/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/CdiAppContextsService.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a 
href="../../../../org/apache/openejb/cdi/CdiAppContextsService.FiredManually.html"
 title="interface in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -349,7 +349,7 @@ extends WebContextsService</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a 
href="../../../../org/apache/openejb/cdi/CdiAppContextsService.FiredManually.html"
 title="interface in org.apache.openejb.cdi"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git 
a/tomee-9.0/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
index c7ea0554e..6dee42919 100644
--- a/tomee-9.0/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/WebAppInjectionResolver.html
@@ -133,7 +133,7 @@ extends InjectionResolver</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/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">WebAppInjectionResolver</a></span>(<a
 href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/openejb/cdi/WebAppInjectionResolver.html#WebAppInjectionResolver-WebBeansContext-">WebAppInjectionResolver</a></span>(WebBeansContext&nbsp;ctx)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -191,13 +191,13 @@ extends InjectionResolver</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a 
name="WebAppInjectionResolver-org.apache.openejb.cdi.WebappWebBeansContext-">
+<a name="WebAppInjectionResolver-WebBeansContext-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WebAppInjectionResolver</h4>
-<pre>public&nbsp;WebAppInjectionResolver(<a 
href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in 
org.apache.openejb.cdi">WebappWebBeansContext</a>&nbsp;ctx)</pre>
+<pre>public&nbsp;WebAppInjectionResolver(WebBeansContext&nbsp;ctx)</pre>
 </li>
 </ul>
 </li>
diff --git a/tomee-9.0/javadoc/org/apache/openejb/cdi/package-frame.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/package-frame.html
index 77af8ba8c..4e44ebdb3 100644
--- a/tomee-9.0/javadoc/org/apache/openejb/cdi/package-frame.html
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/package-frame.html
@@ -18,6 +18,8 @@
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="AppBeanManager.html" title="class in org.apache.openejb.cdi" 
target="classFrame">AppBeanManager</a></li>
+<li><a href="AppWebBeansContext.html" title="class in org.apache.openejb.cdi" 
target="classFrame">AppWebBeansContext</a></li>
 <li><a href="CdiAppContextsService.html" title="class in 
org.apache.openejb.cdi" target="classFrame">CdiAppContextsService</a></li>
 <li><a href="CdiBeanInfo.html" title="class in org.apache.openejb.cdi" 
target="classFrame">CdiBeanInfo</a></li>
 <li><a href="CdiBuilder.html" title="class in org.apache.openejb.cdi" 
target="classFrame">CdiBuilder</a></li>
diff --git a/tomee-9.0/javadoc/org/apache/openejb/cdi/package-summary.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/package-summary.html
index 7a208f58b..bc542d133 100644
--- a/tomee-9.0/javadoc/org/apache/openejb/cdi/package-summary.html
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/package-summary.html
@@ -101,6 +101,14 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi">AppBeanManager</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" title="class 
in org.apache.openejb.cdi">AppWebBeansContext</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/openejb/cdi/CdiAppContextsService.html" 
title="class in org.apache.openejb.cdi">CdiAppContextsService</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/tomee-9.0/javadoc/org/apache/openejb/cdi/package-tree.html 
b/tomee-9.0/javadoc/org/apache/openejb/cdi/package-tree.html
index 03d1e9871..c6424d461 100644
--- a/tomee-9.0/javadoc/org/apache/openejb/cdi/package-tree.html
+++ b/tomee-9.0/javadoc/org/apache/openejb/cdi/package-tree.html
@@ -109,6 +109,11 @@
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/WebappBeanManager.html" title="class 
in org.apache.openejb.cdi"><span 
class="typeNameLink">WebappBeanManager</span></a></li>
 </ul>
 </li>
+<li type="circle">BeanManagerImpl
+<ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppBeanManager</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.openejb.jee.<a 
href="../../../../org/apache/openejb/jee/Beans.html" title="class in 
org.apache.openejb.jee"><span class="typeNameLink">Beans</span></a>
 <ul>
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/CompositeBeans.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">CompositeBeans</span></a></li>
@@ -151,6 +156,11 @@
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/ThreadSingletonServiceImpl.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">ThreadSingletonServiceImpl</span></a> (implements 
org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/ThreadSingletonService.html" 
title="interface in org.apache.openejb.cdi">ThreadSingletonService</a>)</li>
 <li type="circle">WebBeansContext
 <ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/AppWebBeansContext.html" title="class 
in org.apache.openejb.cdi"><span 
class="typeNameLink">AppWebBeansContext</span></a></li>
+</ul>
+</li>
+<li type="circle">WebBeansContext
+<ul>
 <li type="circle">org.apache.openejb.cdi.<a 
href="../../../../org/apache/openejb/cdi/WebappWebBeansContext.html" 
title="class in org.apache.openejb.cdi"><span 
class="typeNameLink">WebappWebBeansContext</span></a></li>
 </ul>
 </li>
diff --git a/tomee-9.0/javadoc/overview-tree.html 
b/tomee-9.0/javadoc/overview-tree.html
index ab40c19f6..2f6d226cd 100644
--- a/tomee-9.0/javadoc/overview-tree.html
+++ b/tomee-9.0/javadoc/overview-tree.html
@@ -1333,6 +1333,11 @@
 <li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappBeanManager.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">WebappBeanManager</span></a></li>
 </ul>
 </li>
+<li type="circle">BeanManagerImpl
+<ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppBeanManager.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppBeanManager</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.openejb.jee.sun.<a 
href="org/apache/openejb/jee/sun/BeanPool.html" title="class in 
org.apache.openejb.jee.sun"><span class="typeNameLink">BeanPool</span></a></li>
 <li type="circle">org.apache.openejb.config.<a 
href="org/apache/openejb/config/BeanProperties.html" title="class in 
org.apache.openejb.config"><span class="typeNameLink">BeanProperties</span></a> 
(implements org.apache.openejb.config.<a 
href="org/apache/openejb/config/DynamicDeployer.html" title="interface in 
org.apache.openejb.config">DynamicDeployer</a>)</li>
 <li type="circle">org.apache.openejb.jee.<a 
href="org/apache/openejb/jee/Beans.html" title="class in 
org.apache.openejb.jee"><span class="typeNameLink">Beans</span></a>
@@ -4835,6 +4840,11 @@
 <li type="circle">org.apache.openejb.arquillian.openejb.http.<a 
href="org/apache/openejb/arquillian/openejb/http/WebArchiveResourceProvider.html"
 title="class in org.apache.openejb.arquillian.openejb.http"><span 
class="typeNameLink">WebArchiveResourceProvider</span></a> (implements 
org.apache.openejb.server.httpd.<a 
href="org/apache/openejb/server/httpd/EmbeddedServletContext.ResourceProvider.html"
 title="interface in 
org.apache.openejb.server.httpd">EmbeddedServletContext.ResourceProvid [...]
 <li type="circle">WebBeansContext
 <ul>
+<li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/AppWebBeansContext.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">AppWebBeansContext</span></a></li>
+</ul>
+</li>
+<li type="circle">WebBeansContext
+<ul>
 <li type="circle">org.apache.openejb.cdi.<a 
href="org/apache/openejb/cdi/WebappWebBeansContext.html" title="class in 
org.apache.openejb.cdi"><span 
class="typeNameLink">WebappWebBeansContext</span></a></li>
 </ul>
 </li>

Reply via email to