[jboss-cvs] JBossAS SVN: r90696 - projects/kernel/trunk/kernel/src/main/resources/schema.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 30 10:02:05 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-30 10:02:05 -0400 (Tue, 30 Jun 2009)
New Revision: 90696
Modified:
projects/kernel/trunk/kernel/src/main/resources/schema/bean-deployer_2_0.xsd
Log:
Use xsd:import instead of xsd:redefine. This eliminates potential errors caused by making a change in the common file without a corresponding change in the deployer file; also, it helps prevent confusion in less sophisticated tooling.
Modified: projects/kernel/trunk/kernel/src/main/resources/schema/bean-deployer_2_0.xsd
===================================================================
--- projects/kernel/trunk/kernel/src/main/resources/schema/bean-deployer_2_0.xsd 2009-06-30 13:48:50 UTC (rev 90695)
+++ projects/kernel/trunk/kernel/src/main/resources/schema/bean-deployer_2_0.xsd 2009-06-30 14:02:05 UTC (rev 90696)
@@ -9,6 +9,8 @@
attributeFormDefault="unqualified"
version="1.0">
+ <xsd:include schemaLocation="jboss-beans-common_2_0.xsd"/>
+
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -22,238 +24,6 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:redefine schemaLocation="jboss-beans-common_2_0.xsd">
- <xsd:complexType name="beanType">
- <xsd:complexContent>
- <xsd:extension base="beanType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="classloaderType">
- <xsd:complexContent>
- <xsd:extension base="classloaderType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="abstractBeanfactoryType">
- <xsd:complexContent>
- <xsd:extension base="abstractBeanfactoryType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="beanfactoryType">
- <xsd:complexContent>
- <xsd:extension base="beanfactoryType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="lazyType">
- <xsd:complexContent>
- <xsd:extension base="lazyType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="constructorType">
- <xsd:complexContent>
- <xsd:extension base="constructorType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="lifecycleType">
- <xsd:complexContent>
- <xsd:extension base="lifecycleType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="installType">
- <xsd:complexContent>
- <xsd:extension base="installType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="uninstallCallbackType">
- <xsd:complexContent>
- <xsd:extension base="uninstallCallbackType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="installCallbackType">
- <xsd:complexContent>
- <xsd:extension base="installCallbackType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="dependencyType">
- <xsd:complexContent>
- <xsd:extension base="dependencyType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="injectionType">
- <xsd:complexContent>
- <xsd:extension base="injectionType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="searchType">
- <xsd:complexContent>
- <xsd:extension base="searchType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="valueFactoryType">
- <xsd:complexContent>
- <xsd:extension base="valueFactoryType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="factoryType">
- <xsd:complexContent>
- <xsd:extension base="factoryType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="aliasType">
- <xsd:complexContent>
- <xsd:extension base="aliasType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="namedAliasType">
- <xsd:complexContent>
- <xsd:extension base="namedAliasType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="parameterType">
- <xsd:complexContent>
- <xsd:extension base="parameterType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="propertyType">
- <xsd:complexContent>
- <xsd:extension base="propertyType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="relatedClassType">
- <xsd:complexContent>
- <xsd:extension base="relatedClassType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="annotationType">
- <xsd:complexContent>
- <xsd:extension base="annotationType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="interfaceType">
- <xsd:complexContent>
- <xsd:extension base="interfaceType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:simpleType name="classNameType">
- <xsd:restriction base="classNameType"/>
- </xsd:simpleType>
- <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"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="valueType">
- <xsd:complexContent>
- <xsd:extension base="valueType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="classLoaderValueType">
- <xsd:complexContent>
- <xsd:extension base="classLoaderValueType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="annotatedValueType">
- <xsd:complexContent>
- <xsd:extension base="annotatedValueType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="namedValueType">
- <xsd:complexContent>
- <xsd:extension base="namedValueType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="baseCollectionType">
- <xsd:complexContent>
- <xsd:extension base="baseCollectionType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="collectionType">
- <xsd:complexContent>
- <xsd:extension base="collectionType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="listType">
- <xsd:complexContent>
- <xsd:extension base="listType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="setType">
- <xsd:complexContent>
- <xsd:extension base="setType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="arrayType">
- <xsd:complexContent>
- <xsd:extension base="arrayType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="mapType">
- <xsd:complexContent>
- <xsd:extension base="mapType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="entryType">
- <xsd:complexContent>
- <xsd:extension base="entryType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="dependsType">
- <xsd:complexContent>
- <xsd:extension base="dependsType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="demandType">
- <xsd:complexContent>
- <xsd:extension base="demandType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="supplyType">
- <xsd:complexContent>
- <xsd:extension base="supplyType"/>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:simpleType name="controllerStateType">
- <xsd:restriction base="controllerStateType"/>
- </xsd:simpleType>
- <xsd:simpleType name="controllerModeType">
- <xsd:restriction base="controllerModeType"/>
- </xsd:simpleType>
- <xsd:simpleType name="autowireTypeType">
- <xsd:restriction base="autowireTypeType"/>
- </xsd:simpleType>
- <xsd:simpleType name="accessModeType">
- <xsd:restriction base="accessModeType"/>
- </xsd:simpleType>
- <xsd:simpleType name="optionType">
- <xsd:restriction base="optionType"/>
- </xsd:simpleType>
- <xsd:simpleType name="contextType">
- <xsd:restriction base="contextType"/>
- </xsd:simpleType>
- </xsd:redefine>
-
<xsd:element name="deployment" type="deploymentType">
<xsd:annotation>
<xsd:documentation>
More information about the jboss-cvs-commits
mailing list