[jboss-cvs] JBossAS SVN: r96191 - in projects/kernel/trunk/weld-int/src: main/java/org/jboss/kernel/weld/plugins/annotations and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 9 14:25:22 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-11-09 14:25:20 -0500 (Mon, 09 Nov 2009)
New Revision: 96191
Added:
projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/
projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledAnnotationPlugin.java
projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledBeanAnnotationPluginInitializer.java
Modified:
projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldDescribeAction.java
projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldInstallAction.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/AbstractWeldMcTest.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java
projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
Log:
[JBKERNEL-51] Use an annotation plugin looking for @WeldEnabled to handle the addition/removal of the KernelControllerContext to the WeldFromMcRegistry
Added: projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledAnnotationPlugin.java (rev 0)
+++ projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledAnnotationPlugin.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -0,0 +1,70 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.kernel.weld.plugins.annotations;
+
+import java.util.List;
+
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
+import org.jboss.kernel.plugins.annotations.ClassAnnotationPlugin;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.weld.metadata.api.annotations.WeldEnabled;
+import org.jboss.kernel.weld.plugins.weld.WeldFromMcRegistry;
+import org.jboss.metadata.spi.MetaData;
+import org.jboss.reflect.spi.ClassInfo;
+
+/**
+ * Annotation plugin looking for the @WeldEnabled annotation. On install it will
+ * add the context to the WeldFromMcRegistry. On uninstall it will remove it from the
+ * WeldFromMcRegistry.
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WeldEnabledAnnotationPlugin extends ClassAnnotationPlugin<WeldEnabled>
+{
+ public static final WeldEnabledAnnotationPlugin INSTANCE = new WeldEnabledAnnotationPlugin();
+
+ protected WeldEnabledAnnotationPlugin()
+ {
+ super(WeldEnabled.class);
+ }
+
+ @Override
+ protected boolean isCleanup()
+ {
+ return true;
+ }
+
+ @Override
+ protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(ClassInfo info, MetaData retrieval, WeldEnabled annotation, KernelControllerContext context) throws Throwable
+ {
+ WeldFromMcRegistry.getInstance().registerBean(context);
+ return null;
+ }
+
+ @Override
+ protected void internalCleanAnnotation(ClassInfo info, MetaData retrieval, WeldEnabled annotation,
+ KernelControllerContext context) throws Throwable
+ {
+ WeldFromMcRegistry.getInstance().unregisterBean(context);
+ }
+}
Added: projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledBeanAnnotationPluginInitializer.java
===================================================================
--- projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledBeanAnnotationPluginInitializer.java (rev 0)
+++ projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/annotations/WeldEnabledBeanAnnotationPluginInitializer.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -0,0 +1,51 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.kernel.weld.plugins.annotations;
+
+import org.jboss.kernel.plugins.annotations.AbstractBeanAnnotationAdapter;
+import org.jboss.kernel.plugins.annotations.BeanAnnotationAdapter;
+import org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory;
+import org.jboss.kernel.plugins.annotations.CommonAnnotationAdapter;
+
+/**
+ * Adds the WeldEnabledAnnotationPlugin to the BeanAnnotationAdapter
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WeldEnabledBeanAnnotationPluginInitializer extends AbstractBeanAnnotationAdapter
+{
+ public static void initialize()
+ {
+ BeanAnnotationAdapter adapter = BeanAnnotationAdapterFactory.getInstance().getBeanAnnotationAdapter();
+ if (adapter instanceof CommonAnnotationAdapter)
+ {
+ @SuppressWarnings("unchecked")
+ CommonAnnotationAdapter common = (CommonAnnotationAdapter)adapter;
+ common.addAnnotationPlugin(WeldEnabledAnnotationPlugin.INSTANCE);
+ }
+ else
+ {
+ throw new IllegalStateException("Adapter is not an instance of CommonAnnotationAdapter " + adapter);
+ }
+ }
+}
Modified: projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldDescribeAction.java
===================================================================
--- projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldDescribeAction.java 2009-11-09 19:22:02 UTC (rev 96190)
+++ projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldDescribeAction.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -23,6 +23,7 @@
import org.jboss.kernel.plugins.dependency.DescribeAction;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.weld.plugins.annotations.WeldEnabledBeanAnnotationPluginInitializer;
/**
* DescribeAction that looks for weld interaction
@@ -32,6 +33,10 @@
*/
public class WeldDescribeAction extends DescribeAction
{
+ static
+ {
+ WeldEnabledBeanAnnotationPluginInitializer.initialize();
+ }
@Override
protected void applyAnnotations(KernelControllerContext context) throws Throwable
@@ -39,8 +44,8 @@
if (context instanceof WeldKernelControllerContext == false)
throw new IllegalArgumentException("context is not a WabBeansKernelControllerContext");
+ applyWeldAnnotations((WeldKernelControllerContext)context);
super.applyAnnotations(context);
- applyWeldAnnotations((WeldKernelControllerContext)context);
}
protected void applyWeldAnnotations(WeldKernelControllerContext context)
@@ -49,6 +54,8 @@
WeldInjector<?> weldInjector = new WeldInjector(context, getClazz(context));
context.setWeldInjector(weldInjector);
weldInjector.describe();
+
+
}
protected Class<?> getClazz(WeldKernelControllerContext context)
@@ -67,5 +74,7 @@
{
if (context instanceof WeldKernelControllerContext)
UnsatisfiedDependencyRegistry.getInstance().removeHungContext((WeldKernelControllerContext)context);
+
+ super.uninstallActionInternal(context);
}
}
Modified: projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldInstallAction.java
===================================================================
--- projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldInstallAction.java 2009-11-09 19:22:02 UTC (rev 96190)
+++ projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/dependency/WeldInstallAction.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -23,6 +23,7 @@
import org.jboss.kernel.plugins.dependency.InstallAction;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.weld.plugins.annotations.WeldEnabledBeanAnnotationPluginInitializer;
/**
*
@@ -31,6 +32,10 @@
*/
public class WeldInstallAction extends InstallAction
{
+ static
+ {
+ WeldEnabledBeanAnnotationPluginInitializer.initialize();
+ }
@Override
protected void installActionInternal(KernelControllerContext context) throws Throwable
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/AbstractWeldMcTest.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/AbstractWeldMcTest.java 2009-11-09 19:22:02 UTC (rev 96190)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/AbstractWeldMcTest.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -158,18 +158,14 @@
/**
* Create a WeldKernelControllerContext and deploy it into the microcontainer.
- * This will also update the WeldFromMcRegistry as required, something that
- * will be done by the deployers when running in AS
*
* @param beanMetaData the bean metadata to deploy
* @return the WeldKernelControllerContext
* @throws Exception if an error happened during deployment
*/
- protected WeldKernelControllerContext deployContextAndRegister(BeanMetaData beanMetaData) throws Exception
+ protected WeldKernelControllerContext deploy(BeanMetaData beanMetaData) throws Exception
{
WeldKernelControllerContext context = getDelegate().deploy(beanMetaData);
- WeldFromMcRegistry.getInstance().registerBean(context);
- WeldFromMcRegistry.getInstance().initializeTypes(getCurrentManager());
return context;
}
@@ -179,9 +175,8 @@
*
* @param context the context
*/
- protected void undeployAndUnregister(KernelControllerContext context)
+ protected void undeploy(KernelControllerContext context)
{
- WeldFromMcRegistry.getInstance().unregisterBean(context);
super.undeploy(context);
}
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java 2009-11-09 19:22:02 UTC (rev 96190)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/bidirectional/test/BidirectionalWeldAndMcTestCase.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -52,8 +52,8 @@
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, Middle.class);
- WeldKernelControllerContext firstContext = deployContextAndRegister(createWeldEnabledBeanMetaData("First", First.class));
- WeldKernelControllerContext lastContext = deployContextAndRegister(createWeldEnabledBeanMetaData("Last", Last.class));
+ WeldKernelControllerContext firstContext = deploy(createWeldEnabledBeanMetaData("First", First.class));
+ WeldKernelControllerContext lastContext = deploy(createWeldEnabledBeanMetaData("Last", Last.class));
try
{
deployInitializedWeld();
@@ -70,8 +70,8 @@
finally
{
undeployWeld();
- undeployAndUnregister(firstContext);
- undeployAndUnregister(lastContext);
+ undeploy(firstContext);
+ undeploy(lastContext);
}
}
@@ -80,7 +80,7 @@
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, First.class, Last.class);
- WeldKernelControllerContext middleContext = deployContextAndRegister(createWeldEnabledBeanMetaData("Middle", Middle.class));
+ WeldKernelControllerContext middleContext = deploy(createWeldEnabledBeanMetaData("Middle", Middle.class));
try
{
deployInitializedWeld();
@@ -95,7 +95,7 @@
finally
{
undeployWeld();
- undeployAndUnregister(middleContext);
+ undeploy(middleContext);
}
}
}
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java 2009-11-09 19:22:02 UTC (rev 96190)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/test/InjectMcBeansInWeldTestCase.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -104,7 +104,7 @@
public void testWeldFromMcRegistry() throws Exception
{
initializeWeld();
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingBean.class));
try
{
Collection<AnnotatedTypeWrapper> types = WeldFromMcRegistry.getInstance().getTypes();
@@ -118,14 +118,14 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testInjectMcBeanIntoField() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, ThingField.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingBean.class));
try
{
ThingBean thing = assertBean("thing", ThingBean.class);
@@ -137,7 +137,7 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
@@ -145,7 +145,7 @@
public void testInjectMcBeanIntoConstructor() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, ThingConstructor.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingBean.class));
try
{
ThingBean thing = assertBean("thing", ThingBean.class);
@@ -157,14 +157,14 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testInjectMcMethodProducedBeanIntoField() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, ThingField.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingMethodProducer.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingMethodProducer.class));
try
{
ThingMethodProducer thing = assertBean("thing", ThingMethodProducer.class);
@@ -176,14 +176,14 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testInjectMcMethodProducedBeanIntoConstructor() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, ThingConstructor.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingMethodProducer.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingMethodProducer.class));
try
{
ThingMethodProducer thing = assertBean("thing", ThingMethodProducer.class);
@@ -195,14 +195,14 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testInjectMcFieldProducedBeanIntoField() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, ThingField.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingFieldProducer.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingFieldProducer.class));
try
{
ThingFieldProducer thing = assertBean("thing", ThingFieldProducer.class);
@@ -214,14 +214,14 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testInjectMcFieldProducedBeanIntoConstructor() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, ThingConstructor.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("thing", ThingFieldProducer.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("thing", ThingFieldProducer.class));
try
{
ThingFieldProducer thing = assertBean("thing", ThingFieldProducer.class);
@@ -233,7 +233,7 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
@@ -242,7 +242,7 @@
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class, LifecycleBeanConsumerA.class, LifecycleBeanConsumerB.class);
LifecycleBean.postConstruct = 0;
LifecycleBean.preDestroy = 0;
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("bean", LifecycleBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("bean", LifecycleBean.class));
try
{
LifecycleBean bean = assertBean("bean", LifecycleBean.class);
@@ -264,7 +264,7 @@
undeployWeld();
assertEquals(0, LifecycleBean.preDestroy);
assertEquals(1, LifecycleBean.postConstruct);
- undeployAndUnregister(context);
+ undeploy(context);
assertEquals(1, LifecycleBean.preDestroy);
assertEquals(1, LifecycleBean.postConstruct);
}
@@ -302,7 +302,7 @@
public void testMcEnabledViaMetaData() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class);
- WeldKernelControllerContext context = deployContextAndRegister(createWeldEnabledBeanMetaData("bean", PlainBean.class));
+ WeldKernelControllerContext context = deploy(createWeldEnabledBeanMetaData("bean", PlainBean.class));
try
{
PlainBean plain = assertBean("bean", PlainBean.class);
@@ -314,7 +314,7 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
@@ -322,7 +322,7 @@
public void testNotMcEnabled() throws Exception
{
initializeWeld(this.getClass().getPackage(), McBeanRegistryObserver.class);
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("bean", PlainBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("bean", PlainBean.class));
try
{
assertBean("bean", PlainBean.class);
@@ -332,7 +332,7 @@
finally
{
undeployWeld();
- undeployAndUnregister(context);
+ undeploy(context);
}
}
}
Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java 2009-11-09 19:22:02 UTC (rev 96190)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/wbtomc/test/InjectWeldInMcBeansTestCase.java 2009-11-09 19:25:20 UTC (rev 96191)
@@ -164,7 +164,7 @@
public void testInjectFromWeldToMcInitializer() throws Exception
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", McBeanInitializerMethod.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanInitializerMethod.class));
McBeanInitializerMethod bean = null;
try
{
@@ -174,14 +174,14 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
assertNull(bean.getBean());
}
public void testInjectFromWeldToMcField() throws Exception
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", McBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBean.class));
McBean bean = null;
try
{
@@ -192,7 +192,7 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
assertNull(bean.getBean());
}
@@ -216,7 +216,7 @@
public void testInjectFromWeldToMcMcConstructorNoParams() throws Exception
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", McBeanMcConstructor.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanMcConstructor.class));
McBeanMcConstructor bean = null;
try
{
@@ -226,18 +226,18 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
assertNull(bean.getBean());
}
public void testInjectFromWeldToMcMcConstructorWithParams() throws Exception
{
- WeldKernelControllerContext contextSimple = deployContextAndRegister(createBeanMetaData("Simple", Simple.class));
+ WeldKernelControllerContext contextSimple = deploy(createBeanMetaData("Simple", Simple.class));
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("McBean", McBeanMcConstructor.class.getName());
builder.addConstructorParameter(Simple.class.getName(), builder.createInject("Simple"));
- WeldKernelControllerContext context = deployContextAndRegister(builder.getBeanMetaData());
+ WeldKernelControllerContext context = deploy(builder.getBeanMetaData());
try
@@ -251,14 +251,14 @@
}
finally
{
- undeployAndUnregister(context);
- undeployAndUnregister(contextSimple);
+ undeploy(context);
+ undeploy(contextSimple);
}
}
public void testConstructorMissingDependencies() throws Exception
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", MissingDependenciesConstructorBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", MissingDependenciesConstructorBean.class));
try
{
@@ -268,13 +268,13 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testFieldMissingDependencies() throws Exception
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", MissingDependenciesFieldBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", MissingDependenciesFieldBean.class));
try
{
@@ -284,13 +284,13 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testDependenciesNotDuplicated() throws Throwable
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", McBean.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBean.class));
try
{
assertNotNull(context.getBeanMetaData().getDepends());
@@ -315,13 +315,13 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
}
public void testPostConstructAndPreDestroy() throws Exception
{
- WeldKernelControllerContext context = deployContextAndRegister(createBeanMetaData("McBean", McBeanWithPostConstructAndPreDestroy.class));
+ WeldKernelControllerContext context = deploy(createBeanMetaData("McBean", McBeanWithPostConstructAndPreDestroy.class));
McBeanWithPostConstructAndPreDestroy bean = null;
try
{
@@ -332,7 +332,7 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
assertNull(bean.getBean());
assertTrue(bean.isPreDestroyCalled());
@@ -360,7 +360,7 @@
property.setAnnotations(propertyAnns);
metaData.addProperty(property);
- WeldKernelControllerContext context = deployContextAndRegister(metaData);
+ WeldKernelControllerContext context = deploy(metaData);
McBeanAnnotationsFromMetaData bean = null;
try
{
@@ -371,7 +371,7 @@
}
finally
{
- undeployAndUnregister(context);
+ undeploy(context);
}
}
More information about the jboss-cvs-commits
mailing list