[weld-commits] Weld SVN: r4611 - in core/trunk: tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2009-11-03 08:15:43 -0500 (Tue, 03 Nov 2009) New Revision: 4611 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java Log: WELD-246 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-03 12:55:14 UTC (rev 4610) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-03 13:15:43 UTC (rev 4611) @@ -72,9 +72,11 @@ // bean is an EJB! ejbDescriptors.addAll(beanDeploymentArchive.getEjbs()); } - beanDeployer = new BeanDeployer(beanManager, ejbDescriptors); + // Must at the Manager bean straight away, as it can be injected during startup! + beanManager.addBean(new ManagerBean(beanManager)); + parseBeansXml(); } @@ -125,7 +127,6 @@ public void deployBeans(Environment environment) { beanDeployer.addClasses(beanDeploymentArchive.getBeanClasses()); - beanDeployer.getEnvironment().addBuiltInBean(new ManagerBean(beanManager)); beanDeployer.getEnvironment().addBuiltInBean(new InjectionPointBean(beanManager)); beanDeployer.getEnvironment().addBuiltInBean(new EventBean(beanManager)); beanDeployer.getEnvironment().addBuiltInBean(new InstanceBean(beanManager)); Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-03 12:55:14 UTC (rev 4610) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-03 13:15:43 UTC (rev 4611) @@ -63,6 +63,7 @@ Observer1 observer1 = beanManager1.getInstanceByType(Observer1.class); assert observer1.isBeforeBeanDiscoveryCalled(); + assert observer1.getBeforeBeanDiscoveryBeanManager().equals(beanManager1); assert observer1.isAfterBeanDiscoveryCalled(); assert observer1.isAfterDeploymentValidationCalled(); assert observer1.isProcessInjectionTargetCalled(); @@ -75,6 +76,7 @@ Observer2 observer2 = beanManager2.getInstanceByType(Observer2.class); assert observer2.isBeforeBeanDiscoveryCalled(); + assert observer2.getBeforeBeanDiscoveryBeanManager().equals(beanManager2); assert observer2.isAfterBeanDiscoveryCalled(); assert observer2.isAfterDeploymentValidationCalled(); assert observer2.isProcessInjectionTargetCalled(); Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java 2009-11-03 12:55:14 UTC (rev 4610) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java 2009-11-03 13:15:43 UTC (rev 4611) @@ -3,6 +3,7 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.ProcessInjectionTarget; @@ -17,9 +18,10 @@ this.afterBeanDiscoveryCalled = true; } - public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event) + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) { this.beforeBeanDiscoveryCalled = true; + this.beforeBeanDiscoveryBeanManager = beanManager; } public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event) Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java 2009-11-03 12:55:14 UTC (rev 4610) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java 2009-11-03 13:15:43 UTC (rev 4611) @@ -3,6 +3,7 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.ProcessInjectionTarget; @@ -17,9 +18,10 @@ this.afterBeanDiscoveryCalled = true; } - public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event) + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) { this.beforeBeanDiscoveryCalled = true; + this.beforeBeanDiscoveryBeanManager = beanManager; } public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event) Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java 2009-11-03 12:55:14 UTC (rev 4610) +++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java 2009-11-03 13:15:43 UTC (rev 4611) @@ -1,6 +1,6 @@ package org.jboss.weld.test.unit.deployment.structure.extensions; -import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.BeanManager; public class ObserverBase { @@ -11,6 +11,8 @@ protected boolean processProducerCalled; protected boolean processInjectionTargetCalled; protected boolean processManagedBeanCalled; + + protected BeanManager beforeBeanDiscoveryBeanManager; public ObserverBase() { @@ -46,5 +48,10 @@ { return processManagedBeanCalled; } + + public BeanManager getBeforeBeanDiscoveryBeanManager() + { + return beforeBeanDiscoveryBeanManager; + } } \ No newline at end of file