Repository: wicket Updated Branches: refs/heads/master cd3b92346 -> 2ecbff661
WICKET-5887 Move <redefine> to the top to comply with XSD sequence order (cherry picked from commit 4ced73e4b8d7ae9bf4f1e1026ae9220ce3b30a9d) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2ecbff66 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2ecbff66 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2ecbff66 Branch: refs/heads/master Commit: 2ecbff6611b7bbf52582d5e2617cbd9d981bc851 Parents: cd3b923 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Apr 21 11:09:34 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Apr 21 11:12:21 2015 +0300 ---------------------------------------------------------------------- wicket-core/src/main/resources/META-INF/wicket.xsd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2ecbff66/wicket-core/src/main/resources/META-INF/wicket.xsd ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/resources/META-INF/wicket.xsd b/wicket-core/src/main/resources/META-INF/wicket.xsd index f10120a..5f8776e 100644 --- a/wicket-core/src/main/resources/META-INF/wicket.xsd +++ b/wicket-core/src/main/resources/META-INF/wicket.xsd @@ -6,6 +6,13 @@ xsi:schemaLocation="http://www.w3.org/1999/xhtml http://www.w3.org/MarkUp/SCHEMA/xhtml-basic10.xsd"; elementFormDefault="qualified" version="7.0.0"> + + <redefine schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml-basic10.xsd";> + <attributeGroup name="xhtml.label.attlist"> + <attributeGroup ref="xhtml.label.attlist"/> + <attribute ref="wicket:for"/> + </attributeGroup> + </redefine> <!-- types --> @@ -81,13 +88,6 @@ </annotation> </attribute> - <redefine schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml-basic10.xsd";> - <attributeGroup name="xhtml.label.attlist"> - <attributeGroup ref="xhtml.label.attlist"/> - <attribute ref="wicket:for"/> - </attributeGroup> - </redefine> - <attribute name="for"> <annotation> <documentation>Can be used in HTML <![CDATA[<label]]> element to automatically link it
