[jboss-cvs] JBossAS SVN: r73993 - in projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata: spi/factory and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-06-03 08:29:31 -0400 (Tue, 03 Jun 2008)
New Revision: 73993

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/BeanFactory.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/factory/GenericBeanFactoryMetaData.java
Log:
Add factoryClass attribute to @BeanFactory.
Add helper method to GenericBeanFactoryMD.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/BeanFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/BeanFactory.java	2008-06-03 11:37:22 UTC (rev 73992)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/BeanFactory.java	2008-06-03 12:29:31 UTC (rev 73993)
@@ -52,6 +52,13 @@
    String name() default "";
 
    /**
+    * Get factory class.
+    *
+    * @return factory class
+    */
+   Class<?> getFactoryClass() default void.class;
+
+   /**
     * Get the aliases.
     *
     * @return the aliases

Modified: 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	2008-06-03 11:37:22 UTC (rev 73992)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/factory/GenericBeanFactoryMetaData.java	2008-06-03 12:29:31 UTC (rev 73993)
@@ -32,6 +32,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.beans.info.spi.BeanAccessMode;
 import org.jboss.beans.metadata.plugins.AbstractAliasMetaData;
@@ -551,8 +552,15 @@
       this.uninstalls = uninstalls;
    }
 
+   @XmlTransient
    public List<BeanMetaData> getBeans()
    {
+      return Collections.singletonList(getBeanMetaData());
+   }
+
+   @XmlTransient
+   public BeanMetaData getBeanMetaData()
+   {
       if (getBean() == null)
       {
          ConstructorMetaData constructor = getConstructor();
@@ -612,7 +620,7 @@
          }
          builder.addPropertyMetaData("properties", propertyMap);
       }
-      return Collections.singletonList(builder.getBeanMetaData());
+      return builder.getBeanMetaData();
    }
 
    /**