[jboss-cvs] JBossAS SVN: r70263 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/beans/metadata/plugins/factory and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 29 06:52:41 EST 2008
Author: adrian at jboss.org
Date: 2008-02-29 06:52:41 -0500 (Fri, 29 Feb 2008)
New Revision: 70263
Added:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/factory/GenericBeanFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment10.java
Removed:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData2.java
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/MapEntry.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding20.java
projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd
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:
[JBMICROCONT-219] - Fix the mc jbossxb parsing to create schemas properly for 1.0 and 2.0. Also made the new GenericBeanFactoryMetaData part of the spi
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -45,7 +45,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder={"annotation"})
+ at XmlType(name="annotationType", propOrder={"annotation"})
public class AbstractAnnotationMetaData extends JBossObject
implements AnnotationMetaData, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -40,7 +40,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="arrayType")
@JBossXmlNoElements
@JBossXmlChildren
({
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -28,9 +28,9 @@
import java.util.Iterator;
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;
@@ -61,7 +61,6 @@
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
-import org.jboss.xb.annotations.JBossXmlSchema;
/**
* Metadata for a bean.
@@ -71,9 +70,8 @@
* @version $Revision$
*/
@ManagementObject(properties = ManagementProperties.EXPLICIT) // TODO - explicitly add props we want to manage
- at JBossXmlSchema(namespace="urn:jboss:bean-deployer:2.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name="bean")
- at XmlType(propOrder={"aliases", "annotations", "classLoader", "constructor", "properties", "create", "start", "stop", "destroy", "depends", "demands", "supplies", "installs", "uninstalls", "installCallbacks", "uninstallCallbacks"})
+ at XmlType(name="beanType", propOrder={"aliases", "annotations", "classLoader", "constructor", "properties", "create", "start", "stop", "destroy", "depends", "demands", "supplies", "installs", "uninstalls", "installCallbacks", "uninstallCallbacks"})
public class AbstractBeanMetaData extends AbstractFeatureMetaData
implements BeanMetaData, BeanMetaDataFactory, MutableLifecycleHolder, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -50,7 +50,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder="classLoader")
+ at XmlType(name="classloaderType", propOrder="classLoader")
public class AbstractClassLoaderMetaData extends JBossObject
implements ClassLoaderMetaData, BeanMetaDataFactory, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -47,7 +47,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="collectionType")
@JBossXmlNoElements
@JBossXmlChildren
({
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractConstructorMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -56,7 +56,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder={"annotations", "factory", "parameters", "value"})
+ at XmlType(name="constructorType", propOrder={"annotations", "factory", "parameters", "value"})
public class AbstractConstructorMetaData extends AbstractFeatureMetaData
implements ConstructorMetaData, MutableParameterizedMetaData, ValueMetaDataAware, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -51,7 +51,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="demandsType")
public class AbstractDemandMetaData extends JBossObject
implements DemandMetaData, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -46,7 +46,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="dependsType")
public class AbstractDependencyMetaData extends JBossObject
implements DependencyMetaData, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -46,7 +46,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="injectionType")
public class AbstractDependencyValueMetaData extends AbstractValueMetaData
{
private static final long serialVersionUID = 3L;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -45,7 +45,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder={"annotations", "parameters"})
+ at XmlType(name="installType", propOrder={"annotations", "parameters"})
public class AbstractInstallMetaData extends AbstractLifecycleMetaData
implements InstallMetaData, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -50,7 +50,7 @@
*/
@JBossXmlSchema(namespace="urn:jboss:bean-deployer:2.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name="lazy")
- at XmlType(propOrder={"interfaces"})
+ at XmlType(name="lazyType", propOrder={"interfaces"})
public class AbstractLazyMetaData extends AbstractBeanMetaData implements LazyMetaData
{
private static final long serialVersionUID = 2L;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLifecycleMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -50,7 +50,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder={"annotations", "parameters"})
+ at XmlType(name="lifecycleType", propOrder={"annotations", "parameters"})
public class AbstractLifecycleMetaData extends AbstractFeatureMetaData
implements LifecycleMetaData, MutableParameterizedMetaData, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -40,7 +40,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="listType")
@JBossXmlNoElements
@JBossXmlChildren
({
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -46,7 +46,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="mapType")
@JBossXmlMapEntry(name = "entry", type = MapEntry.class)
public class AbstractMapMetaData extends AbstractTypeMetaData
implements Map<MetaDataVisitorNode, MetaDataVisitorNode>, Serializable
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -33,7 +33,7 @@
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
- at XmlType
+ at XmlType(name="namedAliasType")
public class AbstractNamedAliasMetaData extends AbstractAliasMetaData implements NamedAliasMetaData
{
/** The serialVersionUID */
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -51,7 +51,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder={"annotations", "value"})
+ at XmlType(name="parameterType", propOrder={"annotations", "value"})
public class AbstractParameterMetaData extends AbstractFeatureMetaData
implements ParameterMetaData, ValueMetaDataAware, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -51,7 +51,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType(propOrder={"annotations", "value"})
+ at XmlType(name="propertyType", propOrder={"annotations", "value"})
public class AbstractPropertyMetaData extends AbstractFeatureMetaData
implements PropertyMetaData, ValueMetaDataAware, TypeProvider, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -40,7 +40,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="setType")
@JBossXmlNoElements
@JBossXmlChildren
({
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -46,7 +46,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="supplyType")
public class AbstractSupplyMetaData extends JBossObject
implements SupplyMetaData, Serializable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -52,7 +52,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
- at XmlType
+ at XmlType(name="valueFactoryType")
public class AbstractValueFactoryMetaData extends AbstractValueMetaData implements MutableParameterizedMetaData
{
private static final long serialVersionUID = 2L;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -30,8 +30,9 @@
* Metadata for install callback.
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
*/
- at XmlType
+ at XmlType(name="installCallbackType")
public class InstallCallbackMetaData extends AbstractCallbackMetaData
{
/** The serialVersionUID */
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/MapEntry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/MapEntry.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/MapEntry.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -34,7 +34,7 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @author <a href="adrian at jboss.com">Adrian Brock</a>
*/
- at XmlType(propOrder= {"key", "value"})
+ at XmlType(name="entryType", propOrder= {"key", "value"})
public class MapEntry
{
/** The key */
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -36,7 +36,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- at XmlType
+ at XmlType(name="plainValueType")
public class StringValueMetaData extends AbstractTypeMetaData
{
private static final long serialVersionUID = 2L;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -30,8 +30,9 @@
* Metadata for uninstall callback.
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
*/
- at XmlType
+ at XmlType(name="uninstallCallbackType")
public class UninstallCallbackMetaData extends AbstractCallbackMetaData
{
/** The serialVersionUID */
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -26,18 +26,10 @@
import java.util.Iterator;
import java.util.Map;
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.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
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.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
@@ -51,7 +43,6 @@
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
import org.jboss.kernel.spi.config.KernelConfigurator;
-import org.jboss.xb.annotations.JBossXmlSchema;
/**
* GenericBeanFactoryMetaData.
@@ -60,9 +51,6 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
- 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"})
@Deprecated
public class GenericBeanFactoryMetaData extends AbstractBeanMetaData
{
@@ -127,14 +115,12 @@
*
* @param beanClass the class
*/
- @XmlAttribute(name="class")
public void setBeanClass(String beanClass)
{
Set<PropertyMetaData> properties = getProperties();
properties.add(new AbstractPropertyMetaData("bean", new AbstractValueMetaData(beanClass)));
}
- @XmlElement(name="classloader", type=AbstractClassLoaderMetaData.class)
public void setClassLoader(ClassLoaderMetaData classLoader)
{
super.setClassLoader(classLoader);
@@ -147,7 +133,6 @@
*
* @param constructor the constructor
*/
- @XmlElement(name="constructor", type=AbstractConstructorMetaData.class)
public void setBeanConstructor(ConstructorMetaData constructor)
{
Set<PropertyMetaData> properties = getProperties();
@@ -207,21 +192,18 @@
map.put(new AbstractValueMetaData(property.getName()), valueMetaData);
}
- @XmlElement(name="create", type= AbstractLifecycleMetaData.class)
public void setBeanCreate(LifecycleMetaData lifecycle)
{
Set<PropertyMetaData> properties = getProperties();
properties.add(new AbstractPropertyMetaData("create", new AbstractValueMetaData(lifecycle)));
}
- @XmlElement(name="start", type=AbstractLifecycleMetaData.class)
public void setBeanStart(LifecycleMetaData lifecycle)
{
Set<PropertyMetaData> properties = getProperties();
properties.add(new AbstractPropertyMetaData("start", new AbstractValueMetaData(lifecycle)));
}
- @XmlTransient
public void setBean(String bean)
{
super.setBean(bean);
Deleted: 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 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/factory/GenericBeanFactoryMetaData2.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -1,363 +0,0 @@
-/*
-* 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.io.Serializable;
-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, Serializable
-{
- 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));
- gbf.setDemands(demands);
- gbf.setDepends(depends);
- gbf.setSupplies(supplies);
- gbf.setInstalls(installs);
- gbf.setUninstalls(uninstalls);
- gbf.setInstallCallbacks(installCallbacks);
- gbf.setUninstallCallbacks(uninstallCallbacks);
- return Collections.singletonList((BeanMetaData) gbf);
- }
-
- /**
- * Create property.
- *
- * @param name the property name
- * @param value the value
- * @return property meta data
- */
- protected PropertyMetaData createProperty(String name, Object value)
- {
- return new AbstractPropertyMetaData(name, value);
- }
-
- /**
- * Create property with map value.
- *
- * @param name the property name
- * @param properties the properties
- * @return property meta data
- */
- 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
Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/factory/GenericBeanFactoryMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/factory/GenericBeanFactoryMetaData.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/factory/GenericBeanFactoryMetaData.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -0,0 +1,539 @@
+/*
+* 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.spi.factory;
+
+import java.io.Serializable;
+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.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.plugins.factory.GenericBeanFactory;
+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;
+
+/**
+ * GenericBeanFactoryMetaData.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 59429 $
+ */
+ at XmlRootElement(name="beanfactory")
+ at XmlType(name="beanfactoryType", propOrder={"aliases", "annotations", "classLoader", "constructor", "properties", "create", "start", "depends", "demands", "supplies", "installs", "uninstalls", "installCallbacks", "uninstallCallbacks"})
+public class GenericBeanFactoryMetaData extends JBossObject implements BeanMetaDataFactory, Serializable
+{
+ 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;
+
+ /** The depends */
+ protected Set<DependencyMetaData> depends;
+
+ /** The demands */
+ protected Set<DemandMetaData> demands;
+
+ /** The supplies */
+ protected Set<SupplyMetaData> supplies;
+
+ /** The installs */
+ protected List<InstallMetaData> installs;
+
+ /** The uninstalls */
+ protected List<InstallMetaData> uninstalls;
+
+ /** The install callbacks */
+ protected List<CallbackMetaData> installCallbacks;
+
+ /** The uninstall callbacks */
+ protected List<CallbackMetaData> uninstallCallbacks;
+
+ /**
+ * Get the name
+ *
+ * @return the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Set the bean name
+ *
+ * @param name the name
+ */
+ @XmlAttribute
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the bean class
+ *
+ * @return the bean class
+ */
+ public String getBean()
+ {
+ return bean;
+ }
+
+ /**
+ * Set the bean class
+ *
+ * @param bean the bean class
+ */
+ @XmlAttribute(name="class")
+ public void setBean(String bean)
+ {
+ this.bean = bean;
+ }
+
+ /**
+ * Get the aliases
+ *
+ * @return the aliases
+ */
+ public Set<Object> getAliases()
+ {
+ return aliases;
+ }
+
+ /**
+ * Set the aliases
+ *
+ * @param aliases the aliases
+ */
+ @XmlElement(name="alias", type=String.class)
+ public void setAliases(Set<Object> aliases)
+ {
+ this.aliases = aliases;
+ }
+
+ /**
+ * Get the mode
+ *
+ * @return the mode
+ */
+ public ControllerMode getMode()
+ {
+ return mode;
+ }
+
+ /**
+ * Set the mode
+ *
+ * @param mode the mode
+ */
+ @XmlAttribute
+ public void setMode(ControllerMode mode)
+ {
+ this.mode = mode;
+ }
+
+ /**
+ * Get the annotations
+ *
+ * @return the annotations
+ */
+ public Set<AnnotationMetaData> getAnnotations()
+ {
+ return annotations;
+ }
+
+ /**
+ * Set the annotations
+ *
+ * @param annotations the annotations
+ */
+ @XmlElement(name="annotation", type=AbstractAnnotationMetaData.class)
+ public void setAnnotations(Set<AnnotationMetaData> annotations)
+ {
+ this.annotations = annotations;
+ }
+
+ /**
+ * Get the classloader
+ *
+ * @return the classloader
+ */
+ public ClassLoaderMetaData getClassLoader()
+ {
+ return classLoader;
+ }
+
+ /**
+ * Set the classloader
+ *
+ * @param classLoader the classloader
+ */
+ @XmlElement(name="classloader", type=AbstractClassLoaderMetaData.class)
+ public void setClassLoader(ClassLoaderMetaData classLoader)
+ {
+ this.classLoader = classLoader;
+ }
+
+ /**
+ * Get the constructor
+ *
+ * @return the constructor
+ */
+ public ConstructorMetaData getConstructor()
+ {
+ return constructor;
+ }
+
+ /**
+ * Set the constructor
+ *
+ * @param constructor the constructor
+ */
+ @XmlElement(name="constructor", type=AbstractConstructorMetaData.class)
+ public void setConstructor(ConstructorMetaData constructor)
+ {
+ this.constructor = constructor;
+ }
+
+ /**
+ * Get the create
+ *
+ * @return the create
+ */
+ public LifecycleMetaData getCreate()
+ {
+ return create;
+ }
+
+ /**
+ * Set the create
+ *
+ * @param create the create
+ */
+ @XmlElement(name="create", type=AbstractLifecycleMetaData.class)
+ public void setCreate(LifecycleMetaData create)
+ {
+ this.create = create;
+ }
+
+ /**
+ * Get the properties
+ *
+ * @return the properties
+ */
+ public Set<PropertyMetaData> getProperties()
+ {
+ return properties;
+ }
+
+ /**
+ * Set the properties
+ *
+ * @param properties the properties
+ */
+ @XmlElement(name="property", type=AbstractPropertyMetaData.class)
+ public void setProperties(Set<PropertyMetaData> properties)
+ {
+ this.properties = properties;
+ }
+
+ /**
+ * Get the start
+ *
+ * @return the start
+ */
+ public LifecycleMetaData getStart()
+ {
+ return start;
+ }
+
+ /**
+ * Set the start
+ *
+ * @param start the start
+ */
+ @XmlElement(name="start", type=AbstractLifecycleMetaData.class)
+ public void setStart(LifecycleMetaData start)
+ {
+ this.start = start;
+ }
+
+ /**
+ * Get the demans
+ *
+ * @return the demands
+ */
+ @XmlElement(name="demand", type=AbstractDemandMetaData.class)
+ public Set<DemandMetaData> getDemands()
+ {
+ return demands;
+ }
+
+ /**
+ * Set the demands
+ *
+ * @param demands the demands
+ */
+ public void setDemands(Set<DemandMetaData> demands)
+ {
+ this.demands = demands;
+ }
+
+ /**
+ * Get the dependencies
+ *
+ * @return the dependencies
+ */
+ public Set<DependencyMetaData> getDepends()
+ {
+ return depends;
+ }
+
+ /**
+ * Set the dependencies
+ *
+ * @param depends the dependencies
+ */
+ @XmlElement(name="depends", type=AbstractDependencyMetaData.class)
+ public void setDepends(Set<DependencyMetaData> depends)
+ {
+ this.depends = depends;
+ }
+
+ /**
+ * Get the install callbacks
+ *
+ * @return the install callbacks
+ */
+ public List<CallbackMetaData> getInstallCallbacks()
+ {
+ return installCallbacks;
+ }
+
+ /**
+ * Set the install callbacks
+ *
+ * @param installCallbacks the install callbacks
+ */
+ @XmlElement(name="incallback", type=InstallCallbackMetaData.class)
+ public void setInstallCallbacks(List<CallbackMetaData> installCallbacks)
+ {
+ this.installCallbacks = installCallbacks;
+ }
+
+ /**
+ * Get the installs
+ *
+ * @return the installs
+ */
+ public List<InstallMetaData> getInstalls()
+ {
+ return installs;
+ }
+
+ /**
+ * Set the installs
+ *
+ * @param installs the installs
+ */
+ @XmlElement(name="install", type=AbstractInstallMetaData.class)
+ public void setInstalls(List<InstallMetaData> installs)
+ {
+ this.installs = installs;
+ }
+
+ /**
+ * Get the supples
+ *
+ * @return the supplies
+ */
+ public Set<SupplyMetaData> getSupplies()
+ {
+ return supplies;
+ }
+
+ /**
+ * Set the supplies
+ *
+ * @param supplies the supplies
+ */
+ @XmlElement(name="supply", type=AbstractSupplyMetaData.class)
+ public void setSupplies(Set<SupplyMetaData> supplies)
+ {
+ this.supplies = supplies;
+ }
+
+ /**
+ * Get the uninstall callbacks
+ *
+ * @return the uninstall callbacks
+ */
+ public List<CallbackMetaData> getUninstallCallbacks()
+ {
+ return uninstallCallbacks;
+ }
+
+ /**
+ * Set the uninstall callbacks
+ *
+ * @param uninstallCallbacks the uninstall callbacls
+ */
+ @XmlElement(name="uncallback", type=UninstallCallbackMetaData.class)
+ public void setUninstallCallbacks(List<CallbackMetaData> uninstallCallbacks)
+ {
+ this.uninstallCallbacks = uninstallCallbacks;
+ }
+
+ /**
+ * Get the uninstalls
+ *
+ * @return the uninstalls
+ */
+ public List<InstallMetaData> getUninstalls()
+ {
+ return uninstalls;
+ }
+
+ /**
+ * Set the uninstalls
+ *
+ * @param uninstalls the 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));
+ gbf.setDemands(demands);
+ gbf.setDepends(depends);
+ gbf.setSupplies(supplies);
+ gbf.setInstalls(installs);
+ gbf.setUninstalls(uninstalls);
+ gbf.setInstallCallbacks(installCallbacks);
+ gbf.setUninstallCallbacks(uninstallCallbacks);
+ return Collections.singletonList((BeanMetaData) gbf);
+ }
+
+ /**
+ * Create property.
+ *
+ * @param name the property name
+ * @param value the value
+ * @return property meta data
+ */
+ protected PropertyMetaData createProperty(String name, Object value)
+ {
+ return new AbstractPropertyMetaData(name, value);
+ }
+
+ /**
+ * Create property with map value.
+ *
+ * @param name the property name
+ * @param properties the properties
+ * @return property meta data
+ */
+ 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-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -44,13 +44,13 @@
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.plugins.AbstractNamedAliasMetaData;
import org.jboss.beans.metadata.plugins.MutableLifecycleHolder;
-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;
import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
import org.jboss.beans.metadata.spi.LifecycleMetaData;
import org.jboss.beans.metadata.spi.NamedAliasMetaData;
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -72,7 +72,7 @@
@ManagementObject(properties = ManagementProperties.EXPLICIT) // TODO - explicitly add props we want to manage
@JBossXmlSchema(namespace="urn:jboss:bean-deployer:2.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name="deployment")
- at XmlType(propOrder={"annotations", "classLoader", "beanFactories", "create", "start", "stop", "destroy", "aliases"})
+ at XmlType(name="deploymentType", propOrder={"annotations", "classLoader", "beanFactories", "create", "start", "stop", "destroy", "aliases"})
public class AbstractKernelDeployment extends JBossObject
implements KernelDeployment, MutableLifecycleHolder, Serializable
{
@@ -146,7 +146,7 @@
@XmlElements
({
@XmlElement(name="bean", type=AbstractBeanMetaData.class),
- @XmlElement(name="beanfactory", type=GenericBeanFactoryMetaData2.class),
+ @XmlElement(name="beanfactory", type=GenericBeanFactoryMetaData.class),
@XmlElement(name="lazy", type=AbstractLazyMetaData.class)
})
@XmlAnyElement
Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment10.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment10.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment10.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -0,0 +1,53 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, 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.kernel.plugins.deployment;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementProperties;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * An abstract kernel deployment.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 69895 $
+ */
+ at ManagementObject(properties = ManagementProperties.EXPLICIT) // TODO - explicitly add props we want to manage
+ at JBossXmlSchema(namespace="urn:jboss:bean-deployer:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="deployment")
+ at XmlType(name="deploymentType", propOrder={"annotations", "classLoader", "beanFactories"})
+public class AbstractKernelDeployment10 extends AbstractKernelDeployment
+{
+ private static final long serialVersionUID = 3l;
+
+ /**
+ * Create a new kernel deployment version 1
+ */
+ public AbstractKernelDeployment10()
+ {
+ }
+}
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding20.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding20.java 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding20.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -122,9 +122,12 @@
/** The install binding */
public static final QName installTypeQName = new QName(BEAN_DEPLOYER_NS, "installType");
- /** The install binding */
- public static final QName callbackTypeQName = new QName(BEAN_DEPLOYER_NS, "callbackType");
+ /** The install callback binding */
+ public static final QName installCallbackTypeQName = new QName(BEAN_DEPLOYER_NS, "installCallbackType");
+ /** The uninstall callback binding */
+ public static final QName uninstallCallbackTypeQName = new QName(BEAN_DEPLOYER_NS, "uninstallCallbackType");
+
/** The install element name */
public static final QName installQName = new QName(BEAN_DEPLOYER_NS, "install");
@@ -341,10 +344,14 @@
TypeBinding installType = schemaBinding.getType(installTypeQName);
BeanSchemaBindingHelper.initInstallHandlers(installType);
- // callback binding
- TypeBinding callbackType = schemaBinding.getType(callbackTypeQName);
- BeanSchemaBindingHelper.initCallbackHandlers(callbackType);
+ // install callback binding
+ TypeBinding incallbackType = schemaBinding.getType(installCallbackTypeQName);
+ BeanSchemaBindingHelper.initCallbackHandlers(incallbackType);
+ // uninstall callback binding
+ TypeBinding uncallbackType = schemaBinding.getType(uninstallCallbackTypeQName);
+ BeanSchemaBindingHelper.initCallbackHandlers(uncallbackType);
+
// property binding
TypeBinding propertyType = schemaBinding.getType(propertyTypeQName);
BeanSchemaBindingHelper.initPropertyHandlers(propertyType);
Modified: projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd 2008-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd 2008-02-29 11:52:41 UTC (rev 70263)
@@ -101,8 +101,8 @@
<xsd:element name="supply" type="supplyType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="install" type="installType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="uninstall" type="installType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="incallback" type="callbackType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="uncallback" type="callbackType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="incallback" type="installCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="uncallback" type="uninstallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
<xsd:attribute name="class" type="xsd:token" use="optional"/>
@@ -154,8 +154,8 @@
<xsd:element name="install" type="installType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="uninstall" type="installType" minOccurs="0" maxOccurs="unbounded"/>
<!--
- <xsd:element name="incallback" type="callbackType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="uncallback" type="callbackType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="incallback" type="intallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="uncallback" type="uninstallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
-->
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
@@ -342,7 +342,7 @@
<xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
</xsd:complexType>
- <xsd:complexType name="callbackType">
+ <xsd:complexType name="uninstallCallbackType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -351,9 +351,9 @@
e.g.
<bean>
- <callback method="addSomething" />
- <callback property="items" cardinality="2..n" />
- <callback property="info" signature="org.jboss.test.Info"/>
+ <uncallback method="addSomething" />
+ <uncallback property="items" cardinality="2..n" />
+ <uncallback property="info" signature="org.jboss.test.Info"/>
</bean>
]]>
</xsd:documentation>
@@ -369,6 +369,33 @@
<xsd:attribute name="signature" type="xsd:token" use="optional"/>
</xsd:complexType>
+ <xsd:complexType name="installCallbackType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Callback item description.
+ Define you methods for callback invocation.
+
+ e.g.
+ <bean>
+ <incallback method="addSomething" />
+ <incallback property="items" cardinality="2..n" />
+ <incallback property="info" signature="org.jboss.test.Info"/>
+ </bean>
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="method" type="xsd:token" use="optional"/>
+ <xsd:attribute name="property" type="xsd:token" use="optional"/>
+ <xsd:attribute name="cardinality" type="xsd:token" use="optional"/>
+ <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+ <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+ <xsd:attribute name="signature" type="xsd:token" use="optional"/>
+ </xsd:complexType>
+
<xsd:complexType name="dependencyType">
<xsd:annotation>
<xsd:documentation>
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-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -37,7 +37,6 @@
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
import org.jboss.beans.metadata.plugins.StringValueMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
-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.CallbackMetaData;
@@ -48,6 +47,7 @@
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.javabean.plugins.jaxb.JavaBean10;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.test.xb.builder.AbstractBuilderTest;
@@ -77,9 +77,9 @@
return unmarshalObject(AbstractBeanMetaData.class, AbstractKernelDeployment.class, JavaBean10.class);
}
- protected GenericBeanFactoryMetaData2 unmarshalBeanFactory() throws Exception
+ protected GenericBeanFactoryMetaData unmarshalBeanFactory() throws Exception
{
- return unmarshalObject(GenericBeanFactoryMetaData2.class, AbstractKernelDeployment.class, JavaBean10.class);
+ return unmarshalObject(GenericBeanFactoryMetaData.class, AbstractKernelDeployment.class, JavaBean10.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-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -26,7 +26,7 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
/**
* AliasJaxbTestCase.
@@ -116,7 +116,7 @@
public void testAliasWithBeanFactory() throws Exception
{
- GenericBeanFactoryMetaData2 bean = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData bean = unmarshalBeanFactory();
Set<Object> 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-02-29 11:04:16 UTC (rev 70262)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2008-02-29 11:52:41 UTC (rev 70263)
@@ -26,7 +26,8 @@
import java.util.List;
import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
+
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.dependency.spi.ControllerMode;
/**
@@ -39,7 +40,7 @@
{
public void testBeanFactoryWithName() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertEquals("Name1", factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -60,7 +61,7 @@
public void testBeanFactoryWithClass() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals(Object.class.getName(), factory.getBean());
assertNull(factory.getMode());
@@ -81,7 +82,7 @@
public void testBeanFactoryWithMode() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertEquals(ControllerMode.MANUAL, factory.getMode());
@@ -102,7 +103,7 @@
public void testBeanFactoryWithClassLoader() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -123,7 +124,7 @@
public void testBeanFactoryWithConstructor() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -144,7 +145,7 @@
public void testBeanFactoryWithProperty() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -168,7 +169,7 @@
public void testBeanFactoryWithProperties() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -194,7 +195,7 @@
public void testBeanFactoryWithCreate() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -215,7 +216,7 @@
public void testBeanFactoryWithStart() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -236,7 +237,7 @@
public void testBeanFactoryWithDependency() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -259,7 +260,7 @@
public void testBeanFactoryWithDependencies() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -284,7 +285,7 @@
public void testBeanFactoryWithDemand() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -307,7 +308,7 @@
public void testBeanFactoryWithDemands() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -332,7 +333,7 @@
public void testBeanFactoryWithSupply() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -355,7 +356,7 @@
public void testBeanFactoryWithSupplies() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -380,7 +381,7 @@
public void testBeanFactoryWithInstall() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -403,7 +404,7 @@
public void testBeanFactoryWithInstalls() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -428,7 +429,7 @@
public void testBeanFactoryWithUninstall() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -451,7 +452,7 @@
public void testBeanFactoryWithUninstalls() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -476,7 +477,7 @@
public void testBeanFactoryWithInstallCallback() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -499,7 +500,7 @@
public void testBeanFactoryWithInstallCallbacks() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -524,7 +525,7 @@
public void testBeanFactoryWithUninstallCallback() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
@@ -547,7 +548,7 @@
public void testBeanFactoryWithUninstallCallbacks() throws Exception
{
- GenericBeanFactoryMetaData2 factory = unmarshalBeanFactory();
+ GenericBeanFactoryMetaData factory = unmarshalBeanFactory();
assertNull(factory.getName());
assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
More information about the jboss-cvs-commits
mailing list