[jboss-cvs] JBossAS SVN: r68659 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/kernel/plugins/deployment and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 7 15:17:14 EST 2008
Author: adrian at jboss.org
Date: 2008-01-07 15:17:14 -0500 (Mon, 07 Jan 2008)
New Revision: 68659
Added:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData2.java
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java
Log:
A better version of the GenericBeanFactoryMetaData - incomplete
Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData2.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData2.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData2.java 2008-01-07 20:17:14 UTC (rev 68659)
@@ -0,0 +1,343 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2007, JBoss Inc., and individual contributors as indicated
+* 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.beans.metadata.plugins.factory;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDependencyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
+import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
+import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.InstallCallbackMetaData;
+import org.jboss.beans.metadata.plugins.UninstallCallbackMetaData;
+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.PropertyMetaData;
+import org.jboss.beans.metadata.spi.SupplyMetaData;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.util.JBossObject;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * GenericBeanFactoryMetaData.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 59429 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:bean-deployer:2.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="beanfactory")
+ at XmlType(propOrder={"aliases", "annotations", "classLoader", "constructor", "properties", "create", "start", "depends", "demands", "supplies", "installs", "uninstalls", "installCallbacks", "uninstallCallbacks"})
+public class GenericBeanFactoryMetaData2 extends JBossObject implements BeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ /** The name */
+ protected String name;
+
+ /** The bean class name */
+ protected String bean;
+
+ /** The controller mode */
+ protected ControllerMode mode;
+
+ /** The annotations */
+ protected Set<AnnotationMetaData> annotations;
+
+ /** The aliases */
+ protected Set<Object> aliases;
+
+ /** The classloader */
+ protected ClassLoaderMetaData classLoader;
+
+ /** The constructor metadata */
+ protected ConstructorMetaData constructor;
+
+ /** The properties Map<propertyName, ValueMetaData> */
+ protected Set<PropertyMetaData> properties;
+
+ /** The create lifecycle method */
+ protected LifecycleMetaData create;
+
+ /** The start lifecycle method */
+ protected LifecycleMetaData start;
+
+ protected Set<DependencyMetaData> depends;
+
+ protected Set<DemandMetaData> demands;
+
+ protected Set<SupplyMetaData> supplies;
+
+ protected List<InstallMetaData> installs;
+
+ protected List<InstallMetaData> uninstalls;
+
+ protected List<CallbackMetaData> installCallbacks;
+
+ protected List<CallbackMetaData> uninstallCallbacks;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ @XmlAttribute
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getBean()
+ {
+ return bean;
+ }
+
+ @XmlAttribute(name="class")
+ public void setBean(String bean)
+ {
+ this.bean = bean;
+ }
+
+ public Set<Object> getAliases()
+ {
+ return aliases;
+ }
+
+ @XmlElement(name="alias", type=String.class)
+ public void setAliases(Set<Object> aliases)
+ {
+ this.aliases = aliases;
+ }
+
+ public ControllerMode getMode()
+ {
+ return mode;
+ }
+
+ @XmlAttribute
+ public void setMode(ControllerMode mode)
+ {
+ this.mode = mode;
+ }
+
+ public Set<AnnotationMetaData> getAnnotations()
+ {
+ return annotations;
+ }
+
+ @XmlElement(name="annotation", type=AbstractAnnotationMetaData.class)
+ public void setAnnotations(Set<AnnotationMetaData> annotations)
+ {
+ this.annotations = annotations;
+ }
+
+ public ClassLoaderMetaData getClassLoader()
+ {
+ return classLoader;
+ }
+
+ @XmlElement(name="classloader", type=AbstractClassLoaderMetaData.class)
+ public void setClassLoader(ClassLoaderMetaData classLoader)
+ {
+ this.classLoader = classLoader;
+ }
+
+ public ConstructorMetaData getConstructor()
+ {
+ return constructor;
+ }
+
+ @XmlElement(name="constructor", type=AbstractConstructorMetaData.class)
+ public void setConstructor(ConstructorMetaData constructor)
+ {
+ this.constructor = constructor;
+ }
+
+ public LifecycleMetaData getCreate()
+ {
+ return create;
+ }
+
+ @XmlElement(name="create", type=AbstractLifecycleMetaData.class)
+ public void setCreate(LifecycleMetaData create)
+ {
+ this.create = create;
+ }
+
+ public Set<PropertyMetaData> getProperties()
+ {
+ return properties;
+ }
+
+ @XmlElement(name="property", type=AbstractPropertyMetaData.class)
+ public void setProperties(Set<PropertyMetaData> properties)
+ {
+ this.properties = properties;
+ }
+
+ public LifecycleMetaData getStart()
+ {
+ return start;
+ }
+
+ @XmlElement(name="start", type=AbstractLifecycleMetaData.class)
+ public void setStart(LifecycleMetaData start)
+ {
+ this.start = start;
+ }
+
+ @XmlElement(name="demand", type=AbstractDemandMetaData.class)
+ public Set<DemandMetaData> getDemands()
+ {
+ return demands;
+ }
+
+ public void setDemands(Set<DemandMetaData> demands)
+ {
+ this.demands = demands;
+ }
+
+ public Set<DependencyMetaData> getDepends()
+ {
+ return depends;
+ }
+
+ @XmlElement(name="depends", type=AbstractDependencyMetaData.class)
+ public void setDepends(Set<DependencyMetaData> depends)
+ {
+ this.depends = depends;
+ }
+
+ public List<CallbackMetaData> getInstallCallbacks()
+ {
+ return installCallbacks;
+ }
+
+ @XmlElement(name="incallback", type=InstallCallbackMetaData.class)
+ public void setInstallCallbacks(List<CallbackMetaData> installCallbacks)
+ {
+ this.installCallbacks = installCallbacks;
+ }
+
+ public List<InstallMetaData> getInstalls()
+ {
+ return installs;
+ }
+
+ @XmlElement(name="install", type=AbstractInstallMetaData.class)
+ public void setInstalls(List<InstallMetaData> installs)
+ {
+ this.installs = installs;
+ }
+
+ public Set<SupplyMetaData> getSupplies()
+ {
+ return supplies;
+ }
+
+ @XmlElement(name="supply", type=AbstractSupplyMetaData.class)
+ public void setSupplies(Set<SupplyMetaData> supplies)
+ {
+ this.supplies = supplies;
+ }
+
+ public List<CallbackMetaData> getUninstallCallbacks()
+ {
+ return uninstallCallbacks;
+ }
+
+ @XmlElement(name="uncallback", type=UninstallCallbackMetaData.class)
+ public void setUninstallCallbacks(List<CallbackMetaData> uninstallCallbacks)
+ {
+ this.uninstallCallbacks = uninstallCallbacks;
+ }
+
+ public List<InstallMetaData> getUninstalls()
+ {
+ return uninstalls;
+ }
+
+ @XmlElement(name="uninstall", type=AbstractInstallMetaData.class)
+ public void setUninstalls(List<InstallMetaData> uninstalls)
+ {
+ this.uninstalls = uninstalls;
+ }
+
+ public List<BeanMetaData> getBeans()
+ {
+ AbstractBeanMetaData gbf = new AbstractBeanMetaData();
+ gbf.setName(name);
+ gbf.setAliases(aliases);
+ gbf.setBean(GenericBeanFactory.class.getName());
+ gbf.setMode(mode);
+ Set<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
+ gbf.setProperties(properties);
+ properties.add(createProperty("bean", bean));
+ properties.add(createProperty("classLoader", classLoader));
+ properties.add(createProperty("constructor", constructor));
+ properties.add(createMapProperty("properties", properties));
+ properties.add(createProperty("start", start));
+ properties.add(createProperty("create", create));
+ // etc.
+ return Collections.singletonList((BeanMetaData) gbf);
+ }
+
+ protected PropertyMetaData createProperty(String name, Object value)
+ {
+ return new AbstractPropertyMetaData(name, value);
+ }
+
+ protected PropertyMetaData createMapProperty(String name, Set<PropertyMetaData> properties)
+ {
+ AbstractMapMetaData map = new AbstractMapMetaData();
+ if (properties != null)
+ {
+ for (PropertyMetaData property : properties)
+ map.put(new AbstractValueMetaData(property.getName()), new AbstractValueMetaData(property));
+ }
+ return new AbstractPropertyMetaData(name, map);
+ }
+}
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2008-01-07 19:50:11 UTC (rev 68658)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2008-01-07 20:17:14 UTC (rev 68659)
@@ -44,6 +44,7 @@
import org.jboss.beans.metadata.plugins.AbstractNamedAliasMetaData;
import org.jboss.beans.metadata.plugins.MutableLifecycleHolder;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
@@ -145,7 +146,7 @@
@XmlElements
({
@XmlElement(name="bean", type=AbstractBeanMetaData.class),
- @XmlElement(name="beanfactory", type=GenericBeanFactoryMetaData.class),
+ @XmlElement(name="beanfactory", type=GenericBeanFactoryMetaData2.class),
@XmlElement(name="lazy", type=AbstractLazyMetaData.class)
})
@XmlAnyElement
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-01-07 19:50:11 UTC (rev 68658)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-01-07 20:17:14 UTC (rev 68659)
@@ -38,6 +38,7 @@
import org.jboss.beans.metadata.plugins.StringValueMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.CallbackMetaData;
import org.jboss.beans.metadata.spi.DemandMetaData;
@@ -76,9 +77,9 @@
return unmarshalObject(AbstractBeanMetaData.class, AbstractKernelDeployment.class, JavaBean.class);
}
- protected GenericBeanFactoryMetaData unmarshalBeanFactory() throws Exception
+ protected GenericBeanFactoryMetaData2 unmarshalBeanFactory() throws Exception
{
- return unmarshalObject(GenericBeanFactoryMetaData.class, AbstractKernelDeployment.class, JavaBean.class);
+ return unmarshalObject(GenericBeanFactoryMetaData2.class, AbstractKernelDeployment.class, JavaBean.class);
}
protected void assertAnnotations(Set<String> expected, Set<AnnotationMetaData> annotations)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-01-07 19:50:11 UTC (rev 68658)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-01-07 20:17:14 UTC (rev 68659)
@@ -24,8 +24,9 @@
import java.util.Set;
import junit.framework.Test;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
/**
* AliasJaxbTestCase.
@@ -115,7 +116,7 @@
public void testAliasWithBeanFactory() throws Exception
{
- GenericBeanFactoryMetaData bean = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 bean = unmarshalBeanFactory();
Set aliases = bean.getAliases();
assertNotNull(aliases);
assertFalse(aliases.isEmpty());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2008-01-07 19:50:11 UTC (rev 68658)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2008-01-07 20:17:14 UTC (rev 68659)
@@ -26,7 +26,8 @@
import java.util.List;
import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
import org.jboss.dependency.spi.ControllerMode;
/**
@@ -39,7 +40,7 @@
{
public void testBeanFactoryWithName() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertEquals("Name1", factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -60,7 +61,7 @@
public void testBeanFactoryWithClass() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals(Object.class.getName(), factory.getBean());
assertNull(factory.getMode());
@@ -81,7 +82,7 @@
public void testBeanFactoryWithMode() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertEquals(ControllerMode.MANUAL, factory.getMode());
@@ -102,7 +103,7 @@
public void testBeanFactoryWithClassLoader() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -123,7 +124,7 @@
public void testBeanFactoryWithConstructor() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -144,7 +145,7 @@
public void testBeanFactoryWithProperty() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -168,7 +169,7 @@
public void testBeanFactoryWithProperties() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -194,7 +195,7 @@
public void testBeanFactoryWithCreate() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -215,7 +216,7 @@
public void testBeanFactoryWithStart() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -236,7 +237,7 @@
public void testBeanFactoryWithDependency() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -259,7 +260,7 @@
public void testBeanFactoryWithDependencies() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -284,7 +285,7 @@
public void testBeanFactoryWithDemand() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -307,7 +308,7 @@
public void testBeanFactoryWithDemands() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -332,7 +333,7 @@
public void testBeanFactoryWithSupply() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -355,7 +356,7 @@
public void testBeanFactoryWithSupplies() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -380,7 +381,7 @@
public void testBeanFactoryWithInstall() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -403,7 +404,7 @@
public void testBeanFactoryWithInstalls() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -428,7 +429,7 @@
public void testBeanFactoryWithUninstall() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -451,7 +452,7 @@
public void testBeanFactoryWithUninstalls() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -476,7 +477,7 @@
public void testBeanFactoryWithInstallCallback() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -499,7 +500,7 @@
public void testBeanFactoryWithInstallCallbacks() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -524,7 +525,7 @@
public void testBeanFactoryWithUninstallCallback() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -547,7 +548,7 @@
public void testBeanFactoryWithUninstallCallbacks() throws Exception
{
- GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
More information about the jboss-cvs-commits
mailing list