[jboss-cvs] JBossAS SVN: r87640 - in projects/microcontainer/branches/Branch_2_0: kernel/src/main/java/org/jboss/beans/metadata/plugins and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 21 11:25:11 EDT 2009
Author: alesj
Date: 2009-04-21 11:25:11 -0400 (Tue, 21 Apr 2009)
New Revision: 87640
Modified:
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/StringValueMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java
projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractPolicyMetaData.java
projects/microcontainer/branches/Branch_2_0/pom.xml
Log:
Update to XB 2.0.1.GA
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -27,6 +27,7 @@
import java.util.Iterator;
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;
@@ -162,6 +163,7 @@
return collection.containsAll(c);
}
+ @XmlTransient
public boolean isEmpty()
{
return collection.isEmpty();
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -206,6 +206,7 @@
return InjectOption.STRICT.equals(injectionOption) || fromContext != null;
}
+ @XmlTransient
public Object getUnderlyingValue()
{
Object original = super.getUnderlyingValue();
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractMapMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -171,6 +171,7 @@
return map.get(key);
}
+ @XmlTransient
public boolean isEmpty()
{
return map.isEmpty();
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlTransient;
import org.jboss.beans.metadata.spi.NamedAliasMetaData;
import org.jboss.util.JBossStringBuilder;
@@ -49,6 +50,7 @@
super();
}
+ @XmlTransient
public Object getName()
{
if (name == null)
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueFactoryMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -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(name="valueFactoryType")
+ at XmlType(name="valueFactoryType", propOrder = {"parameters"})
public class AbstractValueFactoryMetaData extends AbstractValueMetaData implements MutableParameterizedMetaData
{
private static final long serialVersionUID = 2L;
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -73,6 +73,7 @@
setValue(value);
}
+ @XmlTransient
public Object getValue()
{
return value;
@@ -92,6 +93,7 @@
flushJBossObjectCache();
}
+ @XmlTransient
public Object getUnderlyingValue()
{
return value;
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/InstallCallbackMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -32,7 +32,7 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @author <a href="adrian at jboss.com">Adrian Brock</a>
*/
- at XmlType(name="installCallbackType")
+ at XmlType(name="installCallbackType", propOrder={"annotations", "parameters"})
public class InstallCallbackMetaData extends AbstractCallbackMetaData
{
/** The serialVersionUID */
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/StringValueMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/StringValueMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/StringValueMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -166,6 +166,7 @@
return trim;
}
+ @XmlAttribute(name="trim")
public void setTrim(boolean trim)
{
this.trim = trim;
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/UninstallCallbackMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -32,7 +32,7 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @author <a href="adrian at jboss.com">Adrian Brock</a>
*/
- at XmlType(name="uninstallCallbackType")
+ at XmlType(name="uninstallCallbackType", propOrder={"annotations", "parameters"})
public class UninstallCallbackMetaData extends AbstractCallbackMetaData
{
/** The serialVersionUID */
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractBindingMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -53,7 +53,7 @@
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
@XmlRootElement(name="binding")
- at XmlType(name="bindingType")
+ at XmlType(name="bindingType", propOrder = {"value"})
public class AbstractBindingMetaData extends JBossObject implements BindingMetaData, ValueMetaDataAware, Serializable
{
private static final long serialVersionUID = 2;
Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractPolicyMetaData.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractPolicyMetaData.java 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/AbstractPolicyMetaData.java 2009-04-21 15:25:11 UTC (rev 87640)
@@ -49,7 +49,7 @@
*/
@JBossXmlSchema(namespace="urn:jboss:policy:1.0", elementFormDefault= XmlNsForm.QUALIFIED)
@XmlRootElement(name="policy")
- at XmlType(name="policyType")
+ at XmlType(name="policyType", propOrder = {"scope", "annotations", "bindings"})
public class AbstractPolicyMetaData extends JBossObject implements PolicyMetaData, Serializable
{
private static final long serialVersionUID = 2;
Modified: projects/microcontainer/branches/Branch_2_0/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/pom.xml 2009-04-21 15:16:52 UTC (rev 87639)
+++ projects/microcontainer/branches/Branch_2_0/pom.xml 2009-04-21 15:25:11 UTC (rev 87640)
@@ -34,7 +34,7 @@
<version.jboss.common.core>2.2.12.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
<version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
- <version.jbossxb>2.0.1.CR1</version.jbossxb>
+ <version.jbossxb>2.0.1.GA</version.jbossxb>
<version.jboss.man>2.1.0.CR8</version.jboss.man>
<version.jboss.vfs>2.2.0.M3</version.jboss.vfs>
<version.javassist>3.10.0.GA</version.javassist>
More information about the jboss-cvs-commits
mailing list