[jboss-cvs] JBossAS SVN: r73624 - 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-05-23 12:02:59 -0400 (Fri, 23 May 2008)
New Revision: 73624

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
Log:
[JBMICROCONT-289] Duplicate elements from abstractBeanfactoryType in aopBeanFactoryType  rather than using xsd:extension

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-05-23 15:17:30 UTC (rev 73623)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd	2008-05-23 16:02:59 UTC (rev 73624)
@@ -358,17 +358,33 @@
       </xsd:annotation>
    </xsd:element>
    
-   <xsd:complexType name="aopBeanfactoryType">
+   <xsd:complexType name="aopBeanfactoryType" mixed="true">
       <xsd:annotation>
          <xsd:documentation>
-            Similar to the beans beanfactoryType, but with an optional class           
+            Similar to the beans beanfactoryType, but with an optional class.    
+            The elements from abstractBeanfactoryType have been duplicated, rather
+            than using a xsd:extension since we need to use mixed=true
          </xsd:documentation>
       </xsd:annotation>
-      <xsd:complexContent>
-         <xsd:extension base="abstractBeanfactoryType">
-            <xsd:attribute name="class" type="xsd:token" use="required"/>
-         </xsd:extension>
-      </xsd:complexContent>
+      <xsd:sequence>
+         <xsd:element name="alias" type="aliasType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="classloader" type="classloaderType" minOccurs="0"/>
+         <xsd:element name="constructor" type="constructorType" minOccurs="0"/>
+         <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="create" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="start" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="depends" type="dependsType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="demand" type="demandType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="supply" type="supplyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="install" type="installType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="uninstall" type="installType" minOccurs="0" maxOccurs="unbounded"/>
+<!--
+         <xsd:element name="incallback" type="intallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="uncallback" type="uninstallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+-->
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="optional"/>
+      <xsd:attribute name="class" type="xsd:token" use="optional"/>
    </xsd:complexType>
    
    <xsd:complexType name="aspectOrInterceptorType" mixed="true">