[jboss-cvs] JBossAS SVN: r85681 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/binding and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2009-03-10 10:56:52 -0400 (Tue, 10 Mar 2009)
New Revision: 85681

Modified:
   projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java
Log:
JBMETA-183

Modified: projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd	2009-03-10 13:41:40 UTC (rev 85680)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd	2009-03-10 14:56:52 UTC (rev 85681)
@@ -94,7 +94,7 @@
          <xsd:element name="message-destination" type="jboss:message-destinationType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="webservice-description" type="jboss:webservice-descriptionType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element name="servlets" type="jboss:servletType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="servlet" type="jboss:servletType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="max-active-sessions" type="jboss:max-active-sessionsType" minOccurs="0"/>
          <xsd:element name="passivation-config" type="jboss:passivation-configType" minOccurs="0"/>
       </xsd:sequence>

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java	2009-03-10 13:41:40 UTC (rev 85680)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationTest.java	2009-03-10 14:56:52 UTC (rev 85681)
@@ -356,7 +356,7 @@
          XSElementDeclaration xsElement = (XSElementDeclaration) xsTerm;
          QName xsElementName = new QName(xsElement.getNamespace(), xsElement.getName());
          termStr = xsElementName.toString();
-         
+
          if(!termBinding.isElement())
          {
             // TODO sometimes XB wraps (maybe unnecessarily) repeatable elements into a sequence.
@@ -378,6 +378,8 @@
             }
             assertTrue("TermBinding expected to be an element " + termStr + " but was " + termBinding, termBinding.isElement());
          }
+         
+         assertEquals(xsElementName, ((ElementBinding)termBinding).getQName());
       }
       else if(xsTermType == XSConstants.WILDCARD)
       {
@@ -548,7 +550,7 @@
                if(particleQName == WILDCARD)
                   fail("WildcardBinding is missing");
                else
-                  fail("ElementBinding " + particleQName + " is missing");
+                  fail("ElementBinding " + particleQName + " is missing: " + xsElementParticles.keySet());
             }
             assertEquivalent(xsParticle, particleBinding);            
          }