[jboss-cvs] JBossAS SVN: r70005 - in projects/microcontainer/trunk: classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-02-21 10:11:10 -0500 (Thu, 21 Feb 2008)
New Revision: 70005

Modified:
   projects/microcontainer/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java
   projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java
   projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/CapabilitiesMetaData.java
   projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/RequirementsMetaData.java
Log:
Fixes to make the SchemaPrinter print something more useful

Modified: projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/CapabilitiesMetaData.java
===================================================================
--- projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/CapabilitiesMetaData.java	2008-02-21 14:48:44 UTC (rev 70004)
+++ projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/CapabilitiesMetaData.java	2008-02-21 15:11:10 UTC (rev 70005)
@@ -39,7 +39,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at XmlType(propOrder= {"capabilities"})
+ at XmlType(name="capabilties", propOrder= {"capabilities"})
 public class CapabilitiesMetaData implements Serializable, Cloneable
 {
    /** The serialVersionUID */

Modified: projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/RequirementsMetaData.java
===================================================================
--- projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/RequirementsMetaData.java	2008-02-21 14:48:44 UTC (rev 70004)
+++ projects/microcontainer/trunk/classloading/src/main/org/jboss/classloading/spi/metadata/RequirementsMetaData.java	2008-02-21 15:11:10 UTC (rev 70005)
@@ -40,7 +40,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at XmlType(propOrder={"requirements"})
+ at XmlType(name="requirements", propOrder={"requirements"})
 public class RequirementsMetaData implements Serializable, Cloneable
 {
    /** The serialVersionUID */

Modified: projects/microcontainer/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java
===================================================================
--- projects/microcontainer/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java	2008-02-21 14:48:44 UTC (rev 70004)
+++ projects/microcontainer/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java	2008-02-21 15:11:10 UTC (rev 70005)
@@ -27,6 +27,7 @@
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
@@ -166,6 +167,7 @@
       this.roots = roots;
    }
 
+   @XmlTransient
    public List<BeanMetaData> getBeans()
    {
       // Determine some properties

Modified: projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java
===================================================================
--- projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java	2008-02-21 14:48:44 UTC (rev 70004)
+++ projects/microcontainer/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/SchemaPrinter.java	2008-02-21 15:11:10 UTC (rev 70005)
@@ -25,6 +25,7 @@
 import java.util.Iterator;
 
 import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
 
 import org.jboss.xb.binding.sunday.unmarshalling.AllBinding;
 import org.jboss.xb.binding.sunday.unmarshalling.AttributeBinding;
@@ -119,6 +120,12 @@
 
    public static void printType(StringBuilder builder, int pad, TypeBinding type)
    {
+      QName name = type.getQName();
+      if (name != null)
+      {
+         if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(name.getNamespaceURI()))
+            return;
+      }
       if (type.isSimple())
          printSimpleType(builder, pad, type);
       else