Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x b980efc3a -> 4ced73e4b


WICKET-5887 Move <redefine> to the top to comply with XSD sequence order


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4ced73e4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4ced73e4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4ced73e4

Branch: refs/heads/wicket-6.x
Commit: 4ced73e4b8d7ae9bf4f1e1026ae9220ce3b30a9d
Parents: b980efc
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:09:34 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/4ced73e4/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 1f47e22..daa3fbf 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="6.19.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

Reply via email to