[jboss-svn-commits] JBoss Common SVN: r3544 - in jbossxb/trunk/src: main/resources/schema and 1 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2009-09-28 11:55:02 -0400 (Mon, 28 Sep 2009)
New Revision: 3544

Modified:
   jbossxb/trunk/src/main/java/org/jboss/javabean/plugins/jaxb/Constructor.java
   jbossxb/trunk/src/main/resources/schema/javabean_1_0.xsd
   jbossxb/trunk/src/main/resources/schema/javabean_2_0.xsd
   jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/JavaBeanBindingValidationUnitTestCase.java
Log:
JBXB-221

Modified: jbossxb/trunk/src/main/java/org/jboss/javabean/plugins/jaxb/Constructor.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/javabean/plugins/jaxb/Constructor.java	2009-09-28 15:54:18 UTC (rev 3543)
+++ jbossxb/trunk/src/main/java/org/jboss/javabean/plugins/jaxb/Constructor.java	2009-09-28 15:55:02 UTC (rev 3544)
@@ -28,6 +28,9 @@
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlType;
 
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
+
 /**
  * Constructor.
  *
@@ -36,6 +39,7 @@
  * @version $Revision: 1.1 $
  */
 @XmlType(name="constructorType")
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
 public class Constructor
 {
    private String factoryClass;

Modified: jbossxb/trunk/src/main/resources/schema/javabean_1_0.xsd
===================================================================
--- jbossxb/trunk/src/main/resources/schema/javabean_1_0.xsd	2009-09-28 15:54:18 UTC (rev 3543)
+++ jbossxb/trunk/src/main/resources/schema/javabean_1_0.xsd	2009-09-28 15:55:02 UTC (rev 3544)
@@ -73,11 +73,11 @@
       <xsd:complexContent>
          <xsd:extension base="valueType">
             <xsd:sequence>
-            <xsd:any namespace="##other" processContents="strict">
-               <xsd:annotation>
-                  <xsd:documentation>An extension value</xsd:documentation>
-               </xsd:annotation>
-            </xsd:any>
+               <xsd:any namespace="##other" processContents="strict">
+                  <xsd:annotation>
+                     <xsd:documentation>An extension value</xsd:documentation>
+                  </xsd:annotation>
+               </xsd:any>
             </xsd:sequence>
          </xsd:extension>
       </xsd:complexContent>

Modified: jbossxb/trunk/src/main/resources/schema/javabean_2_0.xsd
===================================================================
--- jbossxb/trunk/src/main/resources/schema/javabean_2_0.xsd	2009-09-28 15:54:18 UTC (rev 3543)
+++ jbossxb/trunk/src/main/resources/schema/javabean_2_0.xsd	2009-09-28 15:55:02 UTC (rev 3544)
@@ -104,11 +104,20 @@
          </xsd:documentation>
       </xsd:annotation>
       <xsd:complexContent>
-         <xsd:extension base="valueType"/>
-         <xsd:attribute name="name" type="xsd:token"/>
+         <xsd:extension base="valueType">
+            <xsd:sequence>
+               <xsd:any namespace="##other" processContents="strict">
+                  <xsd:annotation>
+                     <xsd:documentation>An extension value</xsd:documentation>
+                  </xsd:annotation>
+               </xsd:any>
+            </xsd:sequence>
+            <xsd:attribute name="name" type="xsd:token"/>
+         </xsd:extension>
       </xsd:complexContent>
    </xsd:complexType>
-   
+
+<!-- This type is not used in the schema and there is no corresponding Java type
    <xsd:complexType name="parameterType" mixed="true">
       <xsd:annotation>
          <xsd:documentation>
@@ -130,10 +139,12 @@
          </xsd:documentation>
       </xsd:annotation>
       <xsd:complexContent>
-         <xsd:extension base="valueType"/>
-         <xsd:attribute name="paramClass" type="classNameType"/>
+         <xsd:extension base="valueType">
+            <xsd:attribute name="paramClass" type="classNameType"/>
+         </xsd:extension>
       </xsd:complexContent>
    </xsd:complexType>
+-->
 
    <xsd:simpleType name="classNameType">
       <xsd:annotation>

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/JavaBeanBindingValidationUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/JavaBeanBindingValidationUnitTestCase.java	2009-09-28 15:54:18 UTC (rev 3543)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/JavaBeanBindingValidationUnitTestCase.java	2009-09-28 15:55:02 UTC (rev 3544)
@@ -23,6 +23,8 @@
 
 import java.io.InputStream;
 
+import javax.xml.namespace.QName;
+
 import org.jboss.javabean.plugins.jaxb.JavaBean10;
 import org.jboss.javabean.plugins.jaxb.JavaBean20;
 import org.jboss.test.xb.builder.AbstractBuilderTest;
@@ -51,6 +53,7 @@
       InputSource xsdIs = new InputSource(xsd);
       SchemaBinding schema = JBossXBBuilder.build(JavaBean10.class);      
       DefaultSchemaBindingValidator validator = new DefaultSchemaBindingValidator();
+      validator.excludeType(new QName("urn:jboss:javabean:1.0", "valueType"));
       validator.validate(xsdIs, schema);
    }
 
@@ -61,6 +64,7 @@
       InputSource xsdIs = new InputSource(xsd);
       SchemaBinding schema = JBossXBBuilder.build(JavaBean20.class);      
       DefaultSchemaBindingValidator validator = new DefaultSchemaBindingValidator();
+      validator.excludeType(new QName("urn:jboss:javabean:2.0", "valueType"));
       validator.validate(xsdIs, schema);
    }
 }