[jboss-svn-commits] JBoss Common SVN: r3371 - in jbossxb/trunk/src: main/java/org/jboss/xb/util and 1 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2009-07-13 11:01:54 -0400 (Mon, 13 Jul 2009)
New Revision: 3371

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
   jbossxb/trunk/src/main/java/org/jboss/xb/util/DefaultSchemaBindingValidator.java
   jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/BasicBindingValidatorUnitTestCase.java
Log:
JBXB-216

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2009-07-13 11:23:50 UTC (rev 3370)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2009-07-13 15:01:54 UTC (rev 3371)
@@ -968,7 +968,7 @@
                if(preserveSpace != null)
                   attribute.setNormalizeSpace(preserveSpace.preserve() ? false : true);
                if (trace)
-                  log.trace("Bound attribute " + qName + " type=" + beanInfo.getName() + " property=" + property.getName() + " propertyType=" + attributeTypeInfo + ", normalizeSpace=" + attribute.isNormalizeSpace());
+                  log.trace("Bound attribute " + qName + " type=" + beanInfo.getName() + " property=" + property.getName() + " propertyType=" + attributeTypeInfo + ", normalizeSpace=" + attribute.isNormalizeSpace() + ", typeBinding=" + typeBinding.getQName());
             }
 
             // Is this any attribute

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/util/DefaultSchemaBindingValidator.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/util/DefaultSchemaBindingValidator.java	2009-07-13 11:23:50 UTC (rev 3370)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/util/DefaultSchemaBindingValidator.java	2009-07-13 15:01:54 UTC (rev 3371)
@@ -430,6 +430,9 @@
 
          if(!(modelGroupBinding instanceof ChoiceBinding))
             handleError("XSD model group is choice but ModelGroupBinding is " + modelGroupBinding);
+         
+         // ordering in the choice is not important
+         all = true;
       }
       else if(xsCompositor == XSModelGroup.COMPOSITOR_ALL)
       {

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/BasicBindingValidatorUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/BasicBindingValidatorUnitTestCase.java	2009-07-13 11:23:50 UTC (rev 3370)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/validator/test/BasicBindingValidatorUnitTestCase.java	2009-07-13 15:01:54 UTC (rev 3371)
@@ -130,14 +130,16 @@
             choice.addParticle(new ParticleBinding(e));
             SequenceBinding sequence = new SequenceBinding(schema);
             choice.addParticle(new ParticleBinding(sequence));
-            e = new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice3"), schema.getType(Constants.QNAME_STRING));
+            //e = new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice4"), schema.getType(Constants.QNAME_STRING));
+            e = new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice3_1"), schema.getType(Constants.QNAME_STRING));
             sequence.addParticle(new ParticleBinding(e));
-            e = new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice4"), schema.getType(Constants.QNAME_STRING));
-            sequence.addParticle(new ParticleBinding(e));            
+            //e = new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice3"), schema.getType(Constants.QNAME_STRING));
+            e = new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice3_2"), schema.getType(Constants.QNAME_STRING));
+            sequence.addParticle(new ParticleBinding(e));
          }
       };
 
-      new AbstractErrorHandler("Compared elements have different names: XSD QName is {urn:jboss:xb:test}choice3_1, ElementBinding QName is {urn:jboss:xb:test}choice3")
+/*      new AbstractErrorHandler("ElementBinding {urn:jboss:xb:test}choice3 is missing: [{urn:jboss:xb:test}choice1, {urn:jboss:xb:test}choice2, {urn:jboss:xb:test}choice3_2, {urn:jboss:xb:test}choice3_1]")
       {
          public void handle(SchemaBindingValidator validator, SchemaBinding schema)
          {
@@ -162,7 +164,7 @@
             p.setTerm(new ElementBinding(schema, new QName("urn:jboss:xb:test", "choice3_2"), schema.getType(Constants.QNAME_STRING)));
          }
       };
-
+*/
       new AbstractErrorHandler("TypeBinding {urn:jboss:xb:test}aComplexType is not found in the SchemaBinding.")
       {
          public void handle(SchemaBindingValidator validator, SchemaBinding schema)