[jboss-cvs] JBossAS SVN: r68654 - in projects/microcontainer/trunk: container and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 7 13:07:14 EST 2008
Author: adrian at jboss.org
Date: 2008-01-07 13:07:14 -0500 (Mon, 07 Jan 2008)
New Revision: 68654
Modified:
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/container/.classpath
projects/microcontainer/trunk/container/pom.xml
projects/microcontainer/trunk/kernel/.classpath
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
Log:
Update the MC to JBossXB 2.0.0.CR5 and remove the old jbossxb-builder dependency. Also fixed some issues in the new JAXB based parsing. Still more work required.
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/build/pom.xml 2008-01-07 18:07:14 UTC (rev 68654)
@@ -33,8 +33,7 @@
<properties>
<version.jboss.common.core>2.2.3.GA</version.jboss.common.core>
- <version.jbossxb>2.0.0.CR4</version.jbossxb>
- <version.jbossxb.builder>1.0.0-SNAPSHOT</version.jbossxb.builder>
+ <version.jbossxb>2.0.0.CR5</version.jbossxb>
<version.osgi.r4.core>1.0</version.osgi.r4.core>
<version.jboss.vfs>2.0.0.Beta6</version.jboss.vfs>
<version.javassist>3.6.0.GA</version.javassist>
Modified: projects/microcontainer/trunk/container/.classpath
===================================================================
--- projects/microcontainer/trunk/container/.classpath 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/container/.classpath 2008-01-07 18:07:14 UTC (rev 68654)
@@ -16,7 +16,8 @@
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR5/jbossxb-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR5/jbossxb-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/container/pom.xml 2008-01-07 18:07:14 UTC (rev 68654)
@@ -81,10 +81,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb-builder</artifactId>
- </dependency>
- <dependency>
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
Modified: projects/microcontainer/trunk/kernel/.classpath
===================================================================
--- projects/microcontainer/trunk/kernel/.classpath 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/.classpath 2008-01-07 18:07:14 UTC (rev 68654)
@@ -6,7 +6,8 @@
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR5/jbossxb-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR5/jbossxb-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA-sources.jar"/>
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -131,6 +131,7 @@
vistor.describeVisit(this);
}
+ @XmlTransient
public Iterator<? extends MetaDataVisitorNode> getChildren()
{
return null;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.beans.metadata.spi.CallbackMetaData;
@@ -158,12 +159,14 @@
return dependentState;
}
+ @XmlTransient
public void setPropertyInfo(PropertyInfo propertyInfo)
{
this.propertyInfo = propertyInfo;
this.property = propertyInfo.getName();
}
+ @XmlTransient
public void setMethodInfo(MethodInfo methodInfo)
{
this.methodInfo = methodInfo;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDemandMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import java.util.Iterator;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlValue;
@@ -150,6 +151,7 @@
vistor.describeVisit(this);
}
+ @XmlTransient
public Iterator<? extends MetaDataVisitorNode> getChildren()
{
return null;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import java.util.Iterator;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
@@ -104,6 +105,7 @@
vistor.describeVisit(this);
}
+ @XmlTransient
public Iterator<? extends MetaDataVisitorNode> getChildren()
{
return null;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractFeatureMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.FeatureMetaData;
@@ -120,6 +121,7 @@
return typeInfo;
}
+ @XmlTransient
public Iterator<? extends MetaDataVisitorNode> getChildren()
{
Set<MetaDataVisitorNode> children = CollectionsFactory.createLazySet();
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSupplyMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -25,6 +25,7 @@
import java.io.Serializable;
import java.util.Iterator;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.XmlAttribute;
@@ -154,6 +155,7 @@
vistor.describeVisit(this);
}
+ @XmlTransient
public Iterator<? extends MetaDataVisitorNode> getChildren()
{
return null;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -25,6 +25,7 @@
import java.util.Stack;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.info.spi.PropertyInfo;
@@ -302,6 +303,7 @@
*
* @param configurator the configurator
*/
+ @XmlTransient
public void setConfigurator(KernelConfigurator configurator)
{
this.configurator = configurator;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/StringValueMetaData.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -28,7 +28,6 @@
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.logging.Logger;
import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.xb.annotations.JBossXmlNoElements;
/**
* String value.
@@ -38,7 +37,6 @@
* @version $Revision$
*/
@XmlType
- at JBossXmlNoElements
public class StringValueMetaData extends AbstractTypeMetaData
{
private static final long serialVersionUID = 2L;
@@ -75,6 +73,12 @@
super(value);
}
+ @Override
+ public String getValue()
+ {
+ return (String) super.getValue();
+ }
+
/**
* Set the value
*
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2008-01-07 17:50:22 UTC (rev 68653)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2008-01-07 18:07:14 UTC (rev 68654)
@@ -528,11 +528,8 @@
*/
public static void configureValueBindings(TypeBinding typeBinding)
{
-/*
- TODO - test with inner bean!!
// type has bean
typeBinding.pushInterceptor(BeanSchemaBinding20.beanQName, ValueMetaDataElementInterceptor.VALUES);
-*/
// type has values
typeBinding.pushInterceptor(BeanSchemaBinding20.valueQName, ValueMetaDataElementInterceptor.VALUES);
More information about the jboss-cvs-commits
mailing list