[jboss-cvs] JBossAS SVN: r71868 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/deployment/support/container and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 9 22:14:32 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-04-09 22:14:32 -0400 (Wed, 09 Apr 2008)
New Revision: 71868
Added:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentBeanMetaDataFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentNameBuilder.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/GenericComponentFactory.java
Modified:
projects/microcontainer/trunk/kernel/src/etc/conf/log4j.properties
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/InstanceInterceptor.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
Log:
Checkpoint component factory tests with no errors
Modified: projects/microcontainer/trunk/kernel/src/etc/conf/log4j.properties
===================================================================
--- projects/microcontainer/trunk/kernel/src/etc/conf/log4j.properties 2008-04-10 01:41:58 UTC (rev 71867)
+++ projects/microcontainer/trunk/kernel/src/etc/conf/log4j.properties 2008-04-10 02:14:32 UTC (rev 71868)
@@ -7,9 +7,11 @@
### $Id$ ###
log4j.rootCategory=DEBUG, CONSOLE
+log4j.org.jboss.util=TRACE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Threshold=INFO
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java 2008-04-10 01:41:58 UTC (rev 71867)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -57,7 +57,6 @@
public class BeanContextFactory<T> implements BeanMetaDataFactory, KernelControllerContextAware
{
private static final Logger log = Logger.getLogger(BeanContextFactory.class);
- private String baseName;
private String beanClass;
private BeanContainer<T> container;
private Set<TestInjectionMetaData> beanInjectionMD;
@@ -65,17 +64,7 @@
private Map<String, Set<TestInjectionMetaData>> interceptorInjectionMD =
new HashMap<String, Set<TestInjectionMetaData>>();
private List<String> interceptorNames;
- private List<Object> interceptors = new ArrayList<Object>();
- public String getBaseName()
- {
- return baseName;
- }
- public void setBaseName(String baseName)
- {
- this.baseName = baseName;
- }
-
public String getBeanClass()
{
return beanClass;
@@ -141,32 +130,17 @@
try
{
// Create the BeanContext factory
- String contextName = baseName +"#ContextFactory";
- AbstractBeanMetaData contextMetaData = new AbstractBeanMetaData(contextName, GenericBeanFactory.class.getName());
- BeanMetaDataBuilder contextBuilder = BeanMetaDataBuilder.createBuilder(contextMetaData);
+ String contextName = "ContextFactory";
+ BeanMetaDataBuilder contextBuilder = BeanMetaDataBuilder.createBuilder(contextName, BaseContext.class.getName());
contextBuilder.setAccessMode(BeanAccessMode.ALL);
- ValueMetaData injectKernelConfigurator = contextBuilder.createInject(KernelConstants.KERNEL_CONFIGURATOR_NAME);
- contextBuilder.addConstructorParameter(KernelConfigurator.class.getName(), injectKernelConfigurator);
- contextBuilder.addPropertyMetaData("bean", BaseContext.class.getName());
// The BaseContext ctor
- AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
- ParameterMetaDataBuilderImpl<AbstractConstructorMetaData> constructorBuilder = new ParameterMetaDataBuilderImpl<AbstractConstructorMetaData>(constructor);
- constructorBuilder.addParameterMetaData(BeanContainer.class.getName(), container);
- contextBuilder.addPropertyMetaData("constructor", constructor);
+ contextBuilder.addConstructorParameter(BeanContainer.class.getName(), container);
// BaseContext properties
- Set<PropertyMetaData> contextProperties = new HashSet<PropertyMetaData>();
// BaseContext.instance
- String beanName = baseName+"#BeanInstance";
+ String beanName = "BeanInstance";
ValueMetaData beanInstance = contextBuilder.createInject(beanName);
- PropertyMetaData instancePMD = new AbstractPropertyMetaData("instance", beanInstance);
- contextProperties.add(instancePMD);
+ contextBuilder.addPropertyMetaData("instance", beanInstance);
- PropertyMap propertyMap = new PropertyMap();
- for (PropertyMetaData property : contextProperties)
- {
- propertyMap.put(property.getName(), property.getValue());
- }
- contextBuilder.addPropertyMetaData("properties", propertyMap);
BeanMetaData beanContext = contextBuilder.getBeanMetaData();
beans.add(beanContext);
@@ -184,7 +158,7 @@
int count = interceptorNames != null ? interceptorNames.size() : 0;
for(int n = 0; n < count; n ++)
{
- String name = baseName + "#Interceptor:"+n;
+ String name = "Interceptor:"+n;
String iclass = interceptorNames.get(n);
BeanMetaDataBuilder ibuilder = BeanMetaDataBuilder.createBuilder(name, iclass);
ibuilder.addInstall("addInterceptor", contextName);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/InstanceInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/InstanceInterceptor.java 2008-04-10 01:41:58 UTC (rev 71867)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/InstanceInterceptor.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -23,16 +23,22 @@
import java.lang.reflect.Method;
+import org.jboss.logging.Logger;
-
/**
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
public class InstanceInterceptor
{
+ private static Logger log = Logger.getLogger(InstanceInterceptor.class);
private BeanPool<BeanContext<?>> pool;
+ public InstanceInterceptor()
+ {
+ log.info("ctor");
+ }
+
public Object invoke(Object...args)
throws Throwable
{
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentBeanMetaDataFactory.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.test.kernel.deployment.support.container.plugin;
+
+import java.util.List;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public interface ComponentBeanMetaDataFactory
+{
+ public List<BeanMetaData> getBeans(String baseName, long compID, ComponentNameBuilder nameBuilder);
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentFactory.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentFactory.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.test.kernel.deployment.support.container.plugin;
+
+import java.util.List;
+
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+
+/**
+ * A factory for creating a collection of related mc beans based on a
+ * template of BeanMetaData[] from a BeanMetaDataFactory.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public interface ComponentFactory
+{
+ /**
+ * the factory which defines template BeanMetaData[] for the components
+ * @return the BeanMetaDataFactory defining the component beans
+ */
+ public BeanMetaDataFactory getFactory();
+
+ /**
+ * Install a collection of mc beans based on the factory metadata.
+ *
+ * @param baseName - the base bean name used in conjuction wth the factory.getBeans()
+ * BeanMetaData instances getName() to build the unique bean name:
+ * baseName + bmd.getName() + "#" + compID;
+ * @return the list of mc bean names installed.
+ * @throws Throwable - on failure to install the component beans
+ */
+ public List<String> createComponents(String baseName)
+ throws Throwable;
+
+ /**
+ * Extract the unique component id from a component bean name.
+ * @param name - a name previously returned from createComponents.
+ * @return the component id portion of the name
+ * @throws NumberFormatException - if name is not a valild bean component
+ * name with a component id.
+ */
+ public long getComponentID(String name) throws NumberFormatException;
+
+ /**
+ * Uninstall the component beans for the given base name, component id
+ * @param baseName - the baseName previously passed to createComponents
+ * @throws Exception - on failure to uninstall the component beans
+ */
+ public void destroyComponents(String baseName, long compID)
+ throws Exception;
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentNameBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentNameBuilder.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/plugin/ComponentNameBuilder.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.test.kernel.deployment.support.container.plugin;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public interface ComponentNameBuilder
+{
+ public String buildName(String baseName, String compName, long compID);
+ public long getCompID(String name) throws NumberFormatException;
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/GenericComponentFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/GenericComponentFactory.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/spi/GenericComponentFactory.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -0,0 +1,275 @@
+package org.jboss.test.kernel.deployment.support.container.spi;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.jboss.beans.info.spi.BeanAccessMode;
+import org.jboss.beans.metadata.api.model.AutowireType;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.CallbackMetaData;
+import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
+import org.jboss.beans.metadata.spi.ConstructorMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
+import org.jboss.beans.metadata.spi.InstallMetaData;
+import org.jboss.beans.metadata.spi.LifecycleMetaData;
+import org.jboss.beans.metadata.spi.MetaDataVisitor;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.spi.SupplyMetaData;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ErrorHandlingMode;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
+import org.jboss.reflect.spi.TypeInfo;
+import org.jboss.test.kernel.deployment.support.container.plugin.ComponentFactory;
+import org.jboss.util.JBossStringBuilder;
+
+public class GenericComponentFactory
+ implements ComponentFactory, KernelControllerContextAware
+{
+ private BeanMetaDataFactory componentsFactory;
+ private AtomicLong compID = new AtomicLong(0);
+ private KernelControllerContext factoryContext;
+
+ public GenericComponentFactory(BeanMetaDataFactory factory)
+ {
+ this.componentsFactory = factory;
+ }
+
+ public void setKernelControllerContext(KernelControllerContext context)
+ throws Exception
+ {
+ factoryContext = context;
+ }
+ public void unsetKernelControllerContext(KernelControllerContext context)
+ throws Exception
+ {
+ factoryContext = null;
+ }
+
+ public List<String> createComponents(String baseName)
+ throws Throwable
+ {
+ ArrayList<String> compNames = new ArrayList<String>();
+ long nextID = compID.incrementAndGet();
+ KernelController controller = (KernelController) factoryContext.getController();
+ List<BeanMetaData> compBeans = componentsFactory.getBeans();
+ for(BeanMetaData bmd : compBeans)
+ {
+ String beanName = buildComponentName(baseName, bmd.getName(), nextID);
+ BeanMetaDataName nbmd = new BeanMetaDataName(beanName, bmd);
+ controller.install(nbmd);
+ compNames.add(beanName);
+ }
+ Set<ControllerContext> notInstalled = controller.getNotInstalled();
+ if(notInstalled.size() != 0)
+ throw new IllegalStateException(notInstalled.toString());
+ return compNames;
+ }
+
+ public void destroyComponents(String baseName, long compID) throws Exception
+ {
+ KernelController controller = (KernelController) factoryContext.getController();
+ List<BeanMetaData> compBeans = componentsFactory.getBeans();
+ for(BeanMetaData bmd : compBeans)
+ {
+ String beanName = buildComponentName(baseName, bmd.getName(), compID);
+ controller.uninstall(beanName);
+ }
+ }
+
+ /**
+ * Parses a name for the #compID suffix
+ */
+ public long getComponentID(String name) throws NumberFormatException
+ {
+ int poundSign = name.indexOf('#');
+ if(poundSign < 0)
+ throw new NumberFormatException(name+" has no #compID suffix");
+ long id = Long.parseLong(name.substring(poundSign+1));
+ return id;
+ }
+
+ public BeanMetaDataFactory getFactory()
+ {
+ return componentsFactory;
+ }
+
+ protected String buildComponentName(String baseName, String compName, long compID)
+ {
+ String beanName = baseName + "@" + compName + "#" + compID;
+ return beanName;
+ }
+
+ static class BeanMetaDataName implements BeanMetaData
+ {
+ BeanMetaData bmd;
+ String name;
+ BeanMetaDataName(String name, BeanMetaData bmd)
+ {
+ this.name = name;
+ this.bmd = bmd;
+ }
+ public Object clone()
+ {
+ return bmd.clone();
+ }
+ public void describeVisit(MetaDataVisitor vistor)
+ {
+ bmd.describeVisit(vistor);
+ }
+ public BeanAccessMode getAccessMode()
+ {
+ return bmd.getAccessMode();
+ }
+ public Set<Object> getAliases()
+ {
+ return bmd.getAliases();
+ }
+ public Set<AnnotationMetaData> getAnnotations()
+ {
+ return bmd.getAnnotations();
+ }
+ public AutowireType getAutowireType()
+ {
+ return bmd.getAutowireType();
+ }
+ public String getBean()
+ {
+ return bmd.getBean();
+ }
+ public Iterator<? extends MetaDataVisitorNode> getChildren()
+ {
+ return bmd.getChildren();
+ }
+ public ClassLoaderMetaData getClassLoader()
+ {
+ return bmd.getClassLoader();
+ }
+ public ConstructorMetaData getConstructor()
+ {
+ return bmd.getConstructor();
+ }
+ public LifecycleMetaData getCreate()
+ {
+ return bmd.getCreate();
+ }
+ public Set<DemandMetaData> getDemands()
+ {
+ return bmd.getDemands();
+ }
+ public Set<DependencyMetaData> getDepends()
+ {
+ return bmd.getDepends();
+ }
+ public String getDescription()
+ {
+ return bmd.getDescription();
+ }
+ public LifecycleMetaData getDestroy()
+ {
+ return bmd.getDestroy();
+ }
+ public ErrorHandlingMode getErrorHandlingMode()
+ {
+ return bmd.getErrorHandlingMode();
+ }
+ public List<CallbackMetaData> getInstallCallbacks()
+ {
+ return bmd.getInstallCallbacks();
+ }
+ public List<InstallMetaData> getInstalls()
+ {
+ return bmd.getInstalls();
+ }
+ public ControllerMode getMode()
+ {
+ return bmd.getMode();
+ }
+ public String getName()
+ {
+ return name;
+ }
+ public String getParent()
+ {
+ return bmd.getParent();
+ }
+ public Set<PropertyMetaData> getProperties()
+ {
+ return bmd.getProperties();
+ }
+ public LifecycleMetaData getStart()
+ {
+ return bmd.getStart();
+ }
+ public LifecycleMetaData getStop()
+ {
+ return bmd.getStop();
+ }
+ public Set<SupplyMetaData> getSupplies()
+ {
+ return bmd.getSupplies();
+ }
+ public Object getUnderlyingValue()
+ {
+ return bmd.getUnderlyingValue();
+ }
+ public List<CallbackMetaData> getUninstallCallbacks()
+ {
+ return bmd.getUninstallCallbacks();
+ }
+ public List<InstallMetaData> getUninstalls()
+ {
+ return bmd.getUninstalls();
+ }
+ public Object getValue(TypeInfo info, ClassLoader cl) throws Throwable
+ {
+ return bmd.getValue(info, cl);
+ }
+ public void initialVisit(MetaDataVisitor vistor)
+ {
+ bmd.initialVisit(vistor);
+ }
+ public boolean isAbstract()
+ {
+ return bmd.isAbstract();
+ }
+ public boolean isAutowireCandidate()
+ {
+ return bmd.isAutowireCandidate();
+ }
+ public void setAnnotations(Set<AnnotationMetaData> annotations)
+ {
+ bmd.setAnnotations(annotations);
+ }
+ public void setClassLoader(ClassLoaderMetaData classLoader)
+ {
+ bmd.setClassLoader(classLoader);
+ }
+ public void setMode(ControllerMode mode)
+ {
+ bmd.setMode(mode);
+ }
+ public void setName(String name)
+ {
+ bmd.setName(name);
+ }
+ public String toShortString()
+ {
+ return bmd.toShortString();
+ }
+ public void toShortString(JBossStringBuilder arg0)
+ {
+ bmd.toShortString(arg0);
+ }
+
+ }
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-04-10 01:41:58 UTC (rev 71867)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -47,6 +47,7 @@
import org.jboss.test.kernel.deployment.support.container.BeanContainer;
import org.jboss.test.kernel.deployment.support.container.BeanContextFactory;
import org.jboss.test.kernel.deployment.support.container.InstanceInterceptor;
+import org.jboss.test.kernel.deployment.support.container.spi.GenericComponentFactory;
/**
* Programatic version of the BeanContainerUsageTestCase tests
@@ -206,7 +207,6 @@
// Bean context factory for Bean1Type
BeanContainer<Bean1Type> container = new BeanContainer<Bean1Type>();
BeanContextFactory<Bean1Type> contextFactory = new BeanContextFactory<Bean1Type>();
- contextFactory.setBaseName("ComponentBeanFactory");
contextFactory.setBeanClass(Bean1Type.class.getName());
contextFactory.setContainer(container);
String[] interceptorNames = {InstanceInterceptor.class.getName()};
@@ -215,7 +215,9 @@
BeanMetaDataFactory contextFactoryMD = installBeanInstance("ComponentBeanFactory", contextFactory);
beanFactories.add(contextFactoryMD);
*/
- beanFactories.add(contextFactory);
+ GenericComponentFactory componentFactory = new GenericComponentFactory(contextFactory);
+ BeanMetaDataFactory componentFactoryMD = installBeanInstance("ComponentBeanFactory", componentFactory);
+ beanFactories.add(componentFactoryMD);
deployment.setBeanFactories(beanFactories);
return deployment;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-04-10 01:41:58 UTC (rev 71867)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-04-10 02:14:32 UTC (rev 71868)
@@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import java.net.URL;
import java.util.HashMap;
+import java.util.List;
import junit.framework.Test;
import org.jboss.beans.metadata.spi.factory.BeanFactory;
@@ -41,6 +42,7 @@
import org.jboss.test.kernel.deployment.support.container.Bean2Type;
import org.jboss.test.kernel.deployment.support.container.BeanContainer;
import org.jboss.test.kernel.deployment.support.container.BeanPool;
+import org.jboss.test.kernel.deployment.support.container.plugin.ComponentFactory;
/**
* Bean Container Test Case.
@@ -111,35 +113,23 @@
deployer.shutdown();
}
+ /*
public void testComponentBeanFactory()
throws Throwable
{
bootstrap();
- /*BeanContextFactory<Bean1Type> contextFactory = (BeanContextFactory<Bean1Type>) bean;
- assertEquals(Bean1Type.class.getName(), contextFactory.getBeanClass());
- assertNotNull(bean);
- contextFactory.
- */
- BeanFactory factory = (BeanFactory) getBean("ComponentBeanFactory#ContextFactory");
- getLog().info("ComponentBeanFactory#ContextFactory bean: "+factory);
+ ComponentFactory factory = (ComponentFactory) getBean("ComponentBeanFactory");
+ getLog().info("ComponentBeanFactory bean: "+factory);
assertNotNull(factory);
- BaseContext <Bean1Type, BeanContainer<Bean1Type>> context =
- (BaseContext <Bean1Type, BeanContainer<Bean1Type>>) factory.createBean();
- getLog().info("ComponentBeanFactory#ContextFactory.createBean result: "+context);
- assertNotNull(context);
- Bean1Type bean1 = context.getInstance();
- getLog().info("BeanContext.instance: "+bean1);
- HashMap<Class, Object> interceptors1 = context.getInterceptorInstances();
- getLog().info("BeanContext.interceptorInstances: "+interceptors1);
+ List<String> beanNames = factory.createComponents("ComponentBeanFactory");
+ getLog().info("createComponents(ComponentBeanFactory): "+beanNames);
- Bean1Type bean11 = (Bean1Type) getBean("ComponentBeanFactory#BeanInstance");
- getLog().info("ComponentBeanFactory#BeanInstance bean: "+bean11);
- assertNotNull(bean11);
- assertTrue(bean1 == bean11);
-
+ Object interceptor = getBean("ComponentBeanFactory at Interceptor:0#1");
+ assertNotNull(interceptor);
deployer.shutdown();
}
+ */
/**
* There is no xml version of ?
More information about the jboss-cvs-commits
mailing list