[jboss-cvs] JBossAS SVN: r67398 - in projects/microcontainer/trunk: kernel/src/resources/main/schema and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 23 07:34:59 EST 2007
Author: kabir.khan at jboss.com
Date: 2007-11-23 07:34:59 -0500 (Fri, 23 Nov 2007)
New Revision: 67398
Modified:
projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd
Log:
[JBAOP-468] Introduce an abstractBeanFactoryType in bean-deployer_2_0.xsd so that bean-deployer_2_0.xsd's beanfactoryType can have a required "class" attribute, and aop-beans_1_0.xsd has a aopBeanfactoryType with and optional "class" attribute
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 2007-11-23 11:48:18 UTC (rev 67397)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd 2007-11-23 12:34:59 UTC (rev 67398)
@@ -20,7 +20,39 @@
]]>
</xsd:documentation>
</xsd:annotation>
+<!--
+ <xsd:element name="domain" type="domainType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ A domain
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:complexType name="domainType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ aspects or interceptors
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexContent>
+ <xsd:choice minOccurs="0" maxOccurs="1">
+ <xsd:element name="interceptor" type="mc:propertyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="property" type="mc:propertyType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="parentFirst" type="xsd:string" use="optional" default="false"/>
+ <xsd:attribute name="inheritDefinitions" type="xsd:string" use="optional" default="true"/>
+ <xsd:attribute name="inheritBindings" type="xsd:boolean" use="optional" default="false"/>
+ <xsd:attribute name="extends" type="xsd:string" use="optional"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType> -->
+
<xsd:element name="interceptor" type="aspectOrInterceptorType">
<xsd:annotation>
<xsd:documentation>
@@ -41,6 +73,19 @@
</xsd:annotation>
</xsd:element>
+ <xsd:complexType name="aopBeanfactoryType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Similar to the beans beanfactoryType, but with an optional class
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexContent>
+ <xsd:extension base="mc:abstractBeanfactoryType">
+ <xsd:attribute name="class" type="xsd:token" use="required"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
<xsd:complexType name="aspectOrInterceptorType">
<xsd:annotation>
<xsd:documentation>
@@ -50,7 +95,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
- <xsd:extension base="mc:beanfactoryType">
+ <xsd:extension base="aopBeanfactoryType">
<!-- xsd:choice minOccurs="0" maxOccurs="1">
<xsd:element name="attribute" type="mc:propertyType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="property" type="mc:propertyType" minOccurs="0" maxOccurs="unbounded"/>
@@ -551,7 +596,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
- <xsd:extension base="mc:beanfactoryType">
+ <xsd:extension base="aopBeanfactoryType">
<xsd:attribute name="manager-bean" type="xsd:string" use="optional"/>
<xsd:attribute name="manager-property" type="xsd:string" use="optional"/>
<xsd:attribute name="method" type="xsd:string" use="optional"/>
Modified: projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd 2007-11-23 11:48:18 UTC (rev 67397)
+++ projects/microcontainer/trunk/kernel/src/resources/main/schema/bean-deployer_2_0.xsd 2007-11-23 12:34:59 UTC (rev 67398)
@@ -132,6 +132,35 @@
</xsd:complexContent>
</xsd:complexType>
+ <xsd:complexType name="abstractBeanfactoryType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Base type for beanfatoryType.
+ ]]>
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <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="callbackType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="uncallback" type="callbackType" minOccurs="0" maxOccurs="unbounded"/>
+-->
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+
<xsd:complexType name="beanfactoryType">
<xsd:annotation>
<xsd:documentation>
@@ -163,25 +192,11 @@
</xsd:documentation>
</xsd:annotation>
- <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="callbackType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="uncallback" type="callbackType" 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:complexContent>
+ <xsd:extension base="abstractBeanfactoryType">
+ <xsd:attribute name="class" type="xsd:token" use="required"/>
+ </xsd:extension>
+ </xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="lazyType">
More information about the jboss-cvs-commits
mailing list