[richfaces-svn-commits] JBoss Rich Faces SVN: r16911 - root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema.

Author: nbelaevski Date: 2010-05-06 18:38:53 -0400 (Thu, 06 May 2010) New Revision: 16911 Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd Log: xHtml-EL schema updated for better compliance with Eclipse IDE Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2010-05-06 18:49:44 UTC (rev 16910) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2010-05-06 22:38:53 UTC (rev 16911) @@ -468,13 +468,15 @@ </xs:documentation> </xs:annotation> - <xs:attribute name="class" type="NMTOKENS"> - <xs:annotation> - <xs:appinfo> - <cdk-addinfo:component-attribute-name>styleClass</cdk-addinfo:component-attribute-name> - </xs:appinfo> - </xs:annotation> - </xs:attribute> + <xs:attributeGroup name="classGroup"> + <xs:attribute name="class" type="NMTOKENS"> + <xs:annotation> + <xs:appinfo> + <cdk-addinfo:component-attribute-name>styleClass</cdk-addinfo:component-attribute-name> + </xs:appinfo> + </xs:annotation> + </xs:attribute> + </xs:attributeGroup> <xs:attributeGroup name="coreattrs"> <xs:annotation> @@ -488,8 +490,8 @@ title advisory title/amplification </xs:documentation> </xs:annotation> + <xs:attributeGroup ref="classGroup" /> <xs:attribute name="id" type="ID" /> - <xs:attribute ref="class" /> <xs:attribute name="style" type="StyleSheet" /> <xs:attribute name="title" type="Text" /> </xs:attributeGroup> @@ -1344,20 +1346,22 @@ </xs:union> </xs:simpleType> - <xs:attribute name="compact"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="compact" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> + <xs:attributeGroup name="compactGroup"> + <xs:attribute name="compact"> + <xs:simpleType> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="compact" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:restriction base="cdk:elFreeformExpression" /> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> <xs:element name="ul" type="ul.content"> <xs:annotation> @@ -2174,48 +2178,56 @@ </xs:union> </xs:simpleType> - <xs:attribute name="checked"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="checked" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="disabled"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="disabled" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="readonly"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="readonly" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> + <xs:attributeGroup name="checkedGroup"> + <xs:attribute name="checked"> + <xs:simpleType> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="checked" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:restriction base="cdk:elFreeformExpression" /> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + + <xs:attributeGroup name="disabledGroup"> + <xs:attribute name="disabled"> + <xs:simpleType> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="disabled" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:restriction base="cdk:elFreeformExpression" /> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + + <xs:attributeGroup name="readonlyGroup"> + <xs:attribute name="readonly"> + <xs:simpleType> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="readonly" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:restriction base="cdk:elFreeformExpression" /> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> <xs:element name="input" type="input.content"> <xs:annotation> @@ -2318,6 +2330,7 @@ <xs:extension base="button.content"> <xs:attributeGroup ref="attrs" /> <xs:attributeGroup ref="focus" /> + <xs:attributeGroup ref="disabledGroup" /> <xs:attribute name="name" /> <xs:attribute name="value" /> <xs:attribute name="type" default="submit"> @@ -2336,7 +2349,6 @@ </xs:union> </xs:simpleType> </xs:attribute> - <xs:attribute ref="disabled" /> </xs:extension> </xs:complexContent> </xs:complexType> @@ -2617,20 +2629,22 @@ </xs:documentation> </xs:annotation> - <xs:attribute name="nowrap"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="nowrap" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression" /> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> + <xs:attributeGroup name="nowrapGroup"> + <xs:attribute name="nowrap"> + <xs:simpleType> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="nowrap" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:restriction base="cdk:elMixedExpression" /> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> <xs:element name="th"> <xs:complexType mixed="true"> @@ -2645,7 +2659,7 @@ <xs:attribute name="colspan" default="1" type="Number" /> <xs:attributeGroup ref="cellhalign" /> <xs:attributeGroup ref="cellvalign" /> - <xs:attribute ref="nowrap" /> + <xs:attributeGroup ref="nowrapGroup" /> <xs:attribute name="bgcolor" type="Color" /> <xs:attribute name="width" type="Length" /> <xs:attribute name="height" type="Length" /> @@ -2667,7 +2681,7 @@ <xs:attribute name="colspan" default="1" type="Number" /> <xs:attributeGroup ref="cellhalign" /> <xs:attributeGroup ref="cellvalign" /> - <xs:attribute ref="nowrap" /> + <xs:attributeGroup ref="nowrapGroup" /> <xs:attribute name="bgcolor" type="Color" /> <xs:attribute name="width" type="Length" /> <xs:attribute name="height" type="Length" /> @@ -2823,8 +2837,8 @@ </xs:group> <xs:complexType name="dir.content"> <xs:group ref="dir.children" /> - <xs:attributeGroup ref="attrs"></xs:attributeGroup> - <xs:attribute ref="compact"></xs:attribute> + <xs:attributeGroup ref="attrs" /> + <xs:attributeGroup ref="compactGroup" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:group name="dir.children"> @@ -2838,7 +2852,7 @@ <xs:complexType name="dl.content"> <xs:group ref="dl.children" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> - <xs:attribute ref="compact"></xs:attribute> + <xs:attributeGroup ref="compactGroup" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -2991,14 +3005,14 @@ <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> <xs:attributeGroup ref="focus"></xs:attributeGroup> + <xs:attributeGroup ref="disabledGroup" /> <xs:attribute default="text" name="type" type="InputType"></xs:attribute> <xs:attribute name="name" type="xs:anySimpleType"> <xs:annotation></xs:annotation> </xs:attribute> <xs:attribute name="value" type="xs:anySimpleType"></xs:attribute> - <xs:attribute ref="checked"></xs:attribute> - <xs:attribute ref="disabled"></xs:attribute> - <xs:attribute ref="readonly"></xs:attribute> + <xs:attributeGroup ref="checkedGroup" /> + <xs:attributeGroup ref="readonlyGroup" /> <xs:attribute name="size" type="xs:anySimpleType"></xs:attribute> <xs:attribute name="maxlength" type="Number"></xs:attribute> <xs:attribute name="src" type="URI"></xs:attribute> @@ -3034,8 +3048,8 @@ <xs:group ref="map.children" /> <xs:attributeGroup ref="i18n"></xs:attributeGroup> <xs:attributeGroup ref="events"></xs:attributeGroup> + <xs:attributeGroup ref="classGroup" /> <xs:attribute use="required" name="id" type="ID" /> - <xs:attribute ref="class" /> <xs:attribute name="style" type="StyleSheet" /> <xs:attribute name="title" type="Text" /> <xs:attribute name="name" type="xs:anySimpleType" /> @@ -3062,7 +3076,7 @@ <xs:complexType name="menu.content"> <xs:group ref="menu.children" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> - <xs:attribute ref="compact"></xs:attribute> + <xs:attributeGroup ref="compactGroup" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3144,7 +3158,7 @@ <xs:group ref="ol.children" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> <xs:attribute name="type" type="OLStyle"></xs:attribute> - <xs:attribute ref="compact"></xs:attribute> + <xs:attributeGroup ref="compactGroup" /> <xs:attribute name="start" type="Number"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3161,7 +3175,7 @@ <xs:complexType name="optgroup.content"> <xs:group ref="optgroup.children" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> - <xs:attribute ref="disabled"></xs:attribute> + <xs:attributeGroup ref="disabledGroup" /> <xs:attribute use="required" name="label" type="Text"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3176,6 +3190,7 @@ <xs:complexType name="option.content" mixed="true"> <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> + <xs:attributeGroup ref="disabledGroup" /> <xs:attribute name="selected"> <xs:simpleType> <xs:union> @@ -3190,7 +3205,6 @@ </xs:union> </xs:simpleType> </xs:attribute> - <xs:attribute ref="disabled"></xs:attribute> <xs:attribute name="label" type="Text"></xs:attribute> <xs:attribute name="value" type="xs:anySimpleType"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> @@ -3247,6 +3261,7 @@ <xs:complexType name="select.content"> <xs:group ref="select.children" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> + <xs:attributeGroup ref="disabledGroup" /> <xs:attribute name="name" type="xs:anySimpleType"></xs:attribute> <xs:attribute name="size" type="Number"></xs:attribute> <xs:attribute name="multiple"> @@ -3263,7 +3278,6 @@ </xs:union> </xs:simpleType> </xs:attribute> - <xs:attribute ref="disabled"></xs:attribute> <xs:attribute name="tabindex" type="tabindexNumber"></xs:attribute> <xs:attribute name="onfocus" type="Script"></xs:attribute> <xs:attribute name="onblur" type="Script"></xs:attribute> @@ -3345,11 +3359,11 @@ <xs:complexType name="textarea.content" mixed="true"> <xs:attributeGroup ref="attrs"></xs:attributeGroup> <xs:attributeGroup ref="focus"></xs:attributeGroup> + <xs:attributeGroup ref="disabledGroup" /> <xs:attribute name="name" type="xs:anySimpleType"></xs:attribute> <xs:attribute use="required" name="rows" type="Number"></xs:attribute> <xs:attribute use="required" name="cols" type="Number"></xs:attribute> - <xs:attribute ref="disabled"></xs:attribute> - <xs:attribute ref="readonly"></xs:attribute> + <xs:attributeGroup ref="readonlyGroup" /> <xs:attribute name="onselect" type="Script"></xs:attribute> <xs:attribute name="onchange" type="Script"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> @@ -3414,7 +3428,7 @@ <xs:group ref="ul.children" /> <xs:attributeGroup ref="attrs" /> <xs:attribute name="type" type="ULStyle" /> - <xs:attribute ref="compact" /> + <xs:attributeGroup ref="compactGroup" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType>