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

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

Author: alesj
Date: 2008-02-28 12:44:34 -0500 (Thu, 28 Feb 2008)
New Revision: 70221

Modified:
   projects/microcontainer/trunk/build/pom.xml
   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/AbstractValueFactoryMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/MapEntry.java
Log:
JBMICROCONT-219;
Applied Alex's JBossXB.Builder JAXB Map handling.
Updated jbossxb to 2.0.0.CR6

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2008-02-28 17:42:20 UTC (rev 70220)
+++ projects/microcontainer/trunk/build/pom.xml	2008-02-28 17:44:34 UTC (rev 70221)
@@ -33,7 +33,7 @@
 
   <properties>
     <version.jboss.common.core>2.2.3.GA</version.jboss.common.core>
-    <version.jbossxb>2.0.0.CR5</version.jbossxb>
+    <version.jbossxb>2.0.0.CR6</version.jbossxb>
     <version.osgi.r4.core>1.0</version.osgi.r4.core>
     <version.jboss.vfs>2.0.0.Beta7</version.jboss.vfs>
     <version.javassist>3.6.0.GA</version.javassist>

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-28 17:42:20 UTC (rev 70220)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java	2008-02-28 17:44:34 UTC (rev 70221)
@@ -30,15 +30,14 @@
 import java.util.Set;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.beans.metadata.spi.MetaDataVisitor;
 import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.reflect.spi.ClassInfo;
 import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.xb.annotations.JBossXmlChild;
-import org.jboss.xb.annotations.JBossXmlChildren;
-import org.jboss.xb.annotations.JBossXmlNoElements;
+import org.jboss.xb.annotations.JBossXmlMapEntry;
 
 /**
  * Map metadata.
@@ -48,11 +47,7 @@
  * @version $Revision$
  */
 @XmlType
- at JBossXmlNoElements
- at JBossXmlChildren
-({
-   @JBossXmlChild(name="entry", type=MapEntry.class)
-})
+ at JBossXmlMapEntry(name = "entry", type = MapEntry.class)
 public class AbstractMapMetaData extends AbstractTypeMetaData
    implements Map<MetaDataVisitorNode, MetaDataVisitorNode>, Serializable
 {
@@ -199,6 +194,7 @@
       return map.values();
    }
 
+   @XmlTransient
    public Iterator<? extends MetaDataVisitorNode> getChildren()
    {
       ArrayList<MetaDataVisitorNode> children = new ArrayList<MetaDataVisitorNode>(keySet());
@@ -236,12 +232,14 @@
     * 
     * @return the class instance
     */
+   @XmlTransient
    protected Object getDefaultInstance()
    {
       return new HashMap<Object, Object>();
    }
 
    @SuppressWarnings("unchecked")
+   @XmlTransient
    protected Class<? extends Map> getExpectedClass()
    {
       return Map.class;

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-28 17:42:20 UTC (rev 70220)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java	2008-02-28 17:44:34 UTC (rev 70221)
@@ -55,7 +55,12 @@
       return name;
    }
 
-   @XmlAttribute(required = true)
+   @XmlAttribute(name = "name", required = true)
+   public void setNameString(String name)
+   {
+      setName(name);
+   }
+
    public void setName(Object name)
    {
       this.name = name;

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-28 17:42:20 UTC (rev 70220)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java	2008-02-28 17:44:34 UTC (rev 70221)
@@ -133,9 +133,9 @@
    }
 
    @XmlAttribute(name="bean", required = true)
-   public void setValue(Object value)
+   public void setBean(String bean)
    {
-      super.setValue(value);
+      setValue(bean);
    }
 
    /**

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-28 17:42:20 UTC (rev 70220)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/MapEntry.java	2008-02-28 17:44:34 UTC (rev 70221)
@@ -24,6 +24,8 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.xb.annotations.JBossXmlMapKey;
+import org.jboss.xb.annotations.JBossXmlMapValue;
 
 
 /**
@@ -41,6 +43,7 @@
    /** The value */
    private ValueMetaData value;
 
+   @JBossXmlMapKey
    public ValueMetaData getKey()
    {
       return key;
@@ -51,6 +54,7 @@
       this.key = key;
    }
 
+   @JBossXmlMapValue
    public ValueMetaData getValue()
    {
       return value;