You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ja...@apache.org on 2007/08/02 01:36:31 UTC
svn commit: r561990 -
/geronimo/server/branches/2.0/modules/geronimo-system/src/main/resources/META-INF/schema/attributes-1.2.xsd
Author: jaydm
Date: Wed Aug 1 16:36:30 2007
New Revision: 561990
URL: http://svn.apache.org/viewvc?view=rev&rev=561990
Log:
GERONIMO-3266 - Second revision of schema
* Corrected the attributes level comment
* Corrected the gbean level comment
Modified:
geronimo/server/branches/2.0/modules/geronimo-system/src/main/resources/META-INF/schema/attributes-1.2.xsd
Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/main/resources/META-INF/schema/attributes-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/main/resources/META-INF/schema/attributes-1.2.xsd?view=diff&rev=561990&r1=561989&r2=561990
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/main/resources/META-INF/schema/attributes-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/main/resources/META-INF/schema/attributes-1.2.xsd Wed Aug 1 16:36:30 2007
@@ -73,14 +73,18 @@
</xsd:element>
<xsd:complexType name="attributesType">
- <xsd:choice>
- <xsd:element name="module" type="atts:moduleType" minOccurs="0"
- maxOccurs="unbounded" />
+ <xsd:sequence>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0"
+ maxOccurs="1" />
+ <xsd:choice>
+ <xsd:element name="module" type="atts:moduleType" minOccurs="0"
+ maxOccurs="unbounded" />
- <!-- The config.xml file in 1.0 use configuration instead of module -->
- <xsd:element name="configuration" type="atts:moduleType"
- minOccurs="0" maxOccurs="unbounded" />
- </xsd:choice>
+ <!-- The config.xml file in 1.0 use configuration instead of module -->
+ <xsd:element name="configuration" type="atts:moduleType"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xsd:choice>
+ </xsd:sequence>
</xsd:complexType>
<xsd:complexType name="moduleType">
@@ -108,10 +112,14 @@
full GBeanName.
</xsd:documentation>
</xsd:annotation>
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="attribute" type="atts:attributeType" />
- <xsd:element name="reference" type="atts:referenceType" />
- </xsd:choice>
+ <xsd:sequence>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0"
+ maxOccurs="1" />
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="attribute" type="atts:attributeType" />
+ <xsd:element name="reference" type="atts:referenceType" />
+ </xsd:choice>
+ </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation>
@@ -185,8 +193,6 @@
<xsd:element name="pattern" minOccurs="0" maxOccurs="unbounded">
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="comment" type="xsd:string"
- minOccurs="0" maxOccurs="1" />
<xsd:element name="groupId" type="xsd:string"
minOccurs="0">
<xsd:annotation>