[jboss-cvs] JBossAS SVN: r72793 - projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema.

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

Author: kabir.khan at jboss.com
Date: 2008-04-28 15:04:18 -0400 (Mon, 28 Apr 2008)
New Revision: 72793

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
Log:
[JBAOP-468] Update schema following tests for JBAOP-551

Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd	2008-04-28 18:15:03 UTC (rev 72792)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd	2008-04-28 19:04:18 UTC (rev 72793)
@@ -279,7 +279,7 @@
          <xsd:element name="prepare" type="prepareType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="stack" type="stackType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="typedef" type="typedefType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:any namespace="##other" processContents="strict" minOccurs="0">
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
             <xsd:annotation>
                <xsd:documentation>An extension value</xsd:documentation>
             </xsd:annotation>
@@ -325,7 +325,7 @@
          <xsd:element name="prepare" type="prepareType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="stack" type="stackType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="typedef" type="typedefType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:any namespace="##other" processContents="strict" minOccurs="0">
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
             <xsd:annotation>
                <xsd:documentation>An extension value</xsd:documentation>
             </xsd:annotation>
@@ -382,7 +382,7 @@
       <xsd:complexContent>
          <xsd:extension base="aopBeanfactoryType">
             <xsd:choice minOccurs="0" maxOccurs="1">
-               <xsd:any namespace="##other" processContents="strict" minOccurs="0">
+               <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
                </xsd:any>
             </xsd:choice>          
             <xsd:attribute name="scope" type="xsd:string" use="optional"/>
@@ -684,7 +684,7 @@
       </xsd:annotation>
       <xsd:simpleContent>
          <xsd:extension base="xsd:string">
-            <xsd:attribute name="name" type="xsd:string" use="required"/>
+            <xsd:attribute name="name" type="xsd:string" use="optional"/>
             <xsd:attribute name="expr" type="xsd:string" use="required"/>
          </xsd:extension>
       </xsd:simpleContent>
@@ -756,10 +756,14 @@
            ]]>
          </xsd:documentation>
       </xsd:annotation>
-      <xsd:attribute name="expr" type="xsd:string" use="required"/>
-      <xsd:attribute name="invisible" type="xsd:boolean" use="required"/>
-      <xsd:attribute name="manager-bean" type="xsd:string" use="optional"/>
-      <xsd:attribute name="manager-property" type="xsd:string" use="optional"/>
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:string">
+            <xsd:attribute name="expr" type="xsd:string" use="required"/>
+            <xsd:attribute name="invisible" type="xsd:boolean" use="optional"/>
+            <xsd:attribute name="manager-bean" type="xsd:string" use="optional"/>
+            <xsd:attribute name="manager-property" type="xsd:string" use="optional"/>
+         </xsd:extension>
+      </xsd:simpleContent>
    </xsd:complexType>
 
    <xsd:element name="annotation" type="aopAnnotationType">
@@ -830,8 +834,8 @@
            ]]>
          </xsd:documentation>
       </xsd:annotation>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-         <xsd:element name="interfaces" type="interfacesType" minOccurs="0" maxOccurs="1" />
+      <xsd:choice minOccurs="1" maxOccurs="unbounded">
+         <xsd:element name="interfaces" type="xsd:string" minOccurs="0" maxOccurs="1" />
          <xsd:element name="mixin" type="mixinType" minOccurs="0" maxOccurs="unbounded" />
       </xsd:choice>
       <xsd:attribute name="class" type="xsd:string" use="optional"></xsd:attribute>
@@ -848,12 +852,12 @@
            ]]>
          </xsd:documentation>
       </xsd:annotation>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-         <xsd:element name="interfaces" type="interfacesType" minOccurs="1" maxOccurs="1" />
-         <xsd:element name="class" type="classType" minOccurs="1" maxOccurs="1" />
-         <xsd:element name="construction" type="constructionType" minOccurs="0" maxOccurs="1" />
-         <xsd:element name="transient" type="transientType" minOccurs="0" maxOccurs="1" />
-      </xsd:choice>
+      <xsd:all minOccurs="1" maxOccurs="1">
+         <xsd:element name="interfaces" type="xsd:string" minOccurs="1" maxOccurs="1" />
+         <xsd:element name="class" type="xsd:string" minOccurs="1" maxOccurs="1" />
+         <xsd:element name="construction" type="xsd:string" minOccurs="0" maxOccurs="1" />
+      </xsd:all>
+      <xsd:attribute name="transient" type="xsd:string" use="optional"/>
    </xsd:complexType>
 
    <xsd:complexType name="interfacesType">
@@ -927,7 +931,7 @@
          </xsd:documentation>
       </xsd:annotation>
       <xsd:choice minOccurs="0" maxOccurs="1">
-         <xsd:any namespace="##other" processContents="strict" minOccurs="0">
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
          </xsd:any>
       </xsd:choice>
       <xsd:attribute name="tag" type="xsd:string" use="required"></xsd:attribute>
@@ -953,7 +957,7 @@
          </xsd:documentation>
       </xsd:annotation>
       <xsd:choice minOccurs="0" maxOccurs="1">
-         <xsd:any namespace="##other" processContents="strict" minOccurs="0">
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
          </xsd:any>
       </xsd:choice>
       <xsd:attribute name="tag" type="xsd:string" use="required"></xsd:attribute>