[jboss-cvs] JBossAS SVN: r70575 - in projects/microcontainer/trunk/kernel/src: resources/tests/org/jboss/test/kernel/deployment/xml/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 8 06:41:52 EST 2008
Author: adrian at jboss.org
Date: 2008-03-08 06:41:52 -0500 (Sat, 08 Mar 2008)
New Revision: 70575
Added:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml
Log:
[JBMICROCONT-219] - Fix the policy parsing
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java 2008-03-08 11:13:13 UTC (rev 70574)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java 2008-03-08 11:41:52 UTC (rev 70575)
@@ -22,16 +22,26 @@
package org.jboss.beans.metadata.plugins.policy;
import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlAnyElement;
+import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
+import org.jboss.beans.metadata.plugins.AbstractCollectionMetaData;
+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;
+import org.jboss.beans.metadata.plugins.AbstractValueFactoryMetaData;
+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.ValueMetaDataAware;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.policy.BindingMetaData;
import org.jboss.util.JBossObject;
@@ -79,7 +89,19 @@
this.type = type;
}
- @XmlTransient
+ @XmlElements
+ ({
+ @XmlElement(name="array", type=AbstractArrayMetaData.class),
+ @XmlElement(name="collection", type=AbstractCollectionMetaData.class),
+ @XmlElement(name="inject", type=AbstractInjectionValueMetaData.class),
+ @XmlElement(name="list", type=AbstractListMetaData.class),
+ @XmlElement(name="map", type=AbstractMapMetaData.class),
+ @XmlElement(name="null", type=AbstractValueMetaData.class),
+ @XmlElement(name="set", type=AbstractSetMetaData.class),
+ @XmlElement(name="this", type=ThisValueMetaData.class),
+ @XmlElement(name="value", type=StringValueMetaData.class),
+ @XmlElement(name="value-factory", type=AbstractValueFactoryMetaData.class)
+ })
public void setValue(ValueMetaData value)
{
this.value = value;
Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java 2008-03-08 11:41:52 UTC (rev 70575)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.
+*/
+ at JBossXmlAdaptedTypes
+({
+ @JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
+ @JBossXmlAdaptedType(type=ControllerMode.class, valueAdapter= ControllerModeValueAdapter.class),
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type= FromContext.class, valueAdapter=FromContextValueAdapter.class),
+ @JBossXmlAdaptedType(type= InjectOption.class, valueAdapter=InjectionOptionValueAdapter.class),
+ @JBossXmlAdaptedType(type= AutowireType.class, valueAdapter= AutowireTypeValueAdapter.class)
+})
+package org.jboss.beans.metadata.plugins.policy;
+
+import org.jboss.beans.metadata.api.model.AutowireTypeValueAdapter;
+import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
+import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
+import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.FromContextValueAdapter;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.InjectionOptionValueAdapter;
+import org.jboss.beans.metadata.api.model.AutowireType;
+import org.jboss.dependency.spi.Cardinality;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+
Modified: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml 2008-03-08 11:13:13 UTC (rev 70574)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BindingWithComplexValue.xml 2008-03-08 11:41:52 UTC (rev 70575)
@@ -2,6 +2,6 @@
<policy xmlns="urn:jboss:policy:1.0">
<binding name="somename">
- <value xmlns="urn:jboss:bean-deployer:2.0" class="java.lang.Integer">42</value>
+ <value class="java.lang.Integer">42</value>
</binding>
</policy>
More information about the jboss-cvs-commits
mailing list