[jboss-cvs] JBossAS SVN: r71242 - projects/microcontainer/branches/jaxb-aop-mc-int/aop-mc-int/src/resources/main/schema.

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

Author: kabir.khan at jboss.com
Date: 2008-03-25 10:23:53 -0400 (Tue, 25 Mar 2008)
New Revision: 71242

Modified:
   projects/microcontainer/branches/jaxb-aop-mc-int/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
Log:
[JBAOP-468] Redo group redefinition so we have a valid schema

Modified: projects/microcontainer/branches/jaxb-aop-mc-int/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
===================================================================
--- projects/microcontainer/branches/jaxb-aop-mc-int/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd	2008-03-25 13:25:55 UTC (rev 71241)
+++ projects/microcontainer/branches/jaxb-aop-mc-int/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd	2008-03-25 14:23:53 UTC (rev 71242)
@@ -121,7 +121,29 @@
       <xsd:simpleType name="classNameType">
          <xsd:restriction base="classNameType"></xsd:restriction>
       </xsd:simpleType>
-      <xsd:group name="valueGroup"/>
+      <xsd:group name="valueGroup">
+         <xsd:choice>
+            <xsd:element name="value" type="plainValueType"/>
+            <xsd:element name="inject" type="injectionType"/>
+            <xsd:element name="value-factory" type="valueFactoryType"/>
+            <xsd:element name="collection" type="collectionType"/>
+            <xsd:element name="list" type="listType"/>
+            <xsd:element name="set" type="setType"/>
+            <xsd:element name="array" type="arrayType"/>
+            <xsd:element name="map" type="mapType"/>
+            <xsd:element name="null">
+               <xsd:complexType/>
+            </xsd:element>
+            <xsd:element name="this">
+               <xsd:complexType/>
+            </xsd:element>
+            <xsd:any namespace="##other" processContents="strict">
+               <xsd:annotation>
+                  <xsd:documentation>An extension value</xsd:documentation>
+               </xsd:annotation>
+            </xsd:any>
+         </xsd:choice>
+      </xsd:group>
       <xsd:complexType name="plainValueType">
          <xsd:complexContent>
             <xsd:extension base="plainValueType"/>
@@ -233,22 +255,22 @@
          </xsd:documentation>
       </xsd:annotation>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
-	      <xsd:element name="domain" type="domainType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="interceptor" type="aspectOrInterceptorType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="aspect" type="aspectOrInterceptorType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="bind" type="bindType" 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:element name="cflow-stack" type="cflowStackType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="dynamic-cflow" type="dynamicCflowStackType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="prepare" type="prepareType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="annotation" type="aopAnnotationType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="precedence" type="precedenceType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="introduction" type="introductionType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="arrayreplacement" type="arrayreplacementType" minOccurs="0" maxOccurs="unbounded"/>
-	      <xsd:element name="arraybind" type="arraybindType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="domain" type="domainType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="interceptor" type="aspectOrInterceptorType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="aspect" type="aspectOrInterceptorType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="bind" type="bindType" 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:element name="cflow-stack" type="cflowStackType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="dynamic-cflow" type="dynamicCflowStackType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="prepare" type="prepareType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="annotation" type="aopAnnotationType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="precedence" type="precedenceType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="introduction" type="introductionType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="arrayreplacement" type="arrayreplacementType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="arraybind" type="arraybindType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:any namespace="##other" processContents="strict" minOccurs="0">
             <xsd:annotation>
                <xsd:documentation>An extension value</xsd:documentation>
@@ -257,7 +279,7 @@
       </xsd:choice>
    </xsd:complexType>
 
-	<xsd:element name="domain" type="domainType">
+   <xsd:element name="domain" type="domainType">
       <xsd:annotation>
          <xsd:documentation>
            <![CDATA[
@@ -322,7 +344,7 @@
    <xsd:complexType name="aopBeanfactoryType">
       <xsd:annotation>
          <xsd:documentation>
-				Similar to the beans beanfactoryType, but with an optional class           
+            Similar to the beans beanfactoryType, but with an optional class           
          </xsd:documentation>
       </xsd:annotation>
       <xsd:complexContent>