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

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

Author: adrian at jboss.org
Date: 2008-03-06 07:54:09 -0500 (Thu, 06 Mar 2008)
New Revision: 70479

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ValueMetaData.java
Log:
[JBMICROCONT-219] - Use the correct type for inject and fix the attribute name

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2008-03-06 12:48:25 UTC (rev 70478)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2008-03-06 12:54:09 UTC (rev 70479)
@@ -115,7 +115,7 @@
       return fromContext;
    }
 
-   @XmlAttribute
+   @XmlAttribute(name="fromContext")
    public void setFromContext(FromContext<? extends ControllerContext> fromContext)
    {
       this.fromContext = fromContext;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ValueMetaData.java	2008-03-06 12:48:25 UTC (rev 70478)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/ValueMetaData.java	2008-03-06 12:54:09 UTC (rev 70479)
@@ -23,7 +23,7 @@
 
 import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
 import org.jboss.beans.metadata.plugins.AbstractCollectionMetaData;
-import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractListMetaData;
 import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
 import org.jboss.beans.metadata.plugins.AbstractSetMetaData;
@@ -48,7 +48,7 @@
 ({
    @JBossXmlChild(name="array", type=AbstractArrayMetaData.class),
    @JBossXmlChild(name="collection", type=AbstractCollectionMetaData.class),
-   @JBossXmlChild(name="inject", type=AbstractDependencyValueMetaData.class),
+   @JBossXmlChild(name="inject", type=AbstractInjectionValueMetaData.class),
    @JBossXmlChild(name="list", type=AbstractListMetaData.class),
    @JBossXmlChild(name="map", type=AbstractMapMetaData.class),
    @JBossXmlChild(name="null", type=AbstractValueMetaData.class),