Align XSD with JPA 3.2 proposals

sebersole · Oct 28, 2023 · bd96836 · bd96836
1 parent e1d1ae7
commit bd96836
Showing 1 changed file with 0 additions and 71 deletions.
diff --git a/hibernate-orm/src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd b/hibernate-orm/src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd
@@ -1358,37 +1358,6 @@
         <xsd:sequence>
             <xsd:group ref="collection-structure-group"/>
 
-<!--            <xsd:element name="collection-id" type="orm:collection-id" minOccurs="0"/>-->
-
-<!--            <xsd:choice>-->
-<!--                <xsd:element name="order-by" type="orm:order-by" minOccurs="0"/>-->
-<!--                <xsd:element name="order-column" type="orm:order-column" minOccurs="0"/>-->
-<!--                <xsd:element name="sort" type="xsd:string" minOccurs="0" />-->
-<!--                <xsd:element name="sort-natural">-->
-<!--                    <xsd:complexType/>-->
-<!--                </xsd:element>-->
-<!--            </xsd:choice>-->
-<!--            <xsd:choice>-->
-<!--                <xsd:element name="map-key" type="orm:map-key" minOccurs="0"/>-->
-<!--                <xsd:sequence>-->
-<!--                    <xsd:element name="map-key-class" type="orm:map-key-class" minOccurs="0"/>-->
-<!--                    <xsd:choice>-->
-<!--                        <xsd:element name="map-key-temporal" type="orm:temporal" minOccurs="0"/>-->
-<!--                        <xsd:element name="map-key-enumerated" type="orm:enumerated" minOccurs="0"/>-->
-<!--                        <xsd:sequence>-->
-<!--                            <xsd:element name="map-key-attribute-override" type="orm:attribute-override" minOccurs="0" maxOccurs="unbounded"/>-->
-<!--                            <xsd:element name="map-key-convert" type="orm:convert" minOccurs="0" maxOccurs="unbounded"/>-->
-<!--                        </xsd:sequence>-->
-<!--                    </xsd:choice>-->
-<!--                    <xsd:choice>-->
-<!--                        <xsd:element name="map-key-column" type="orm:map-key-column" minOccurs="0"/>-->
-<!--                        <xsd:sequence>-->
-<!--                            <xsd:element name="map-key-join-column" type="orm:map-key-join-column" minOccurs="0" maxOccurs="unbounded"/>-->
-<!--                            <xsd:element name="map-key-foreign-key" type="orm:foreign-key" minOccurs="0"/>-->
-<!--                        </xsd:sequence>-->
-<!--                    </xsd:choice>-->
-<!--                </xsd:sequence>-->
-<!--            </xsd:choice>-->
             <xsd:element name="join-table" type="orm:join-table" minOccurs="0"/>
             <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>
             <xsd:element name="filter" type="orm:hbm-filter" minOccurs="0" maxOccurs="unbounded" />
@@ -1863,37 +1832,6 @@
         <xsd:sequence>
             <xsd:group ref="collection-structure-group"/>
 
-<!--            <xsd:element name="collection-id" type="orm:collection-id" minOccurs="0"/>-->
-
-<!--            <xsd:choice>-->
-<!--                <xsd:element name="order-by" type="orm:order-by" minOccurs="0"/>-->
-<!--                <xsd:element name="order-column" type="orm:order-column" minOccurs="0"/>-->
-<!--                <xsd:element name="sort" type="xsd:string" minOccurs="0" />-->
-<!--                <xsd:element name="sort-natural">-->
-<!--                    <xsd:complexType/>-->
-<!--                </xsd:element>-->
-<!--            </xsd:choice>-->
-<!--            <xsd:choice>-->
-<!--                <xsd:element name="map-key" type="orm:map-key" minOccurs="0"/>-->
-<!--                <xsd:sequence>-->
-<!--                    <xsd:element name="map-key-class" type="orm:map-key-class" minOccurs="0"/>-->
-<!--                    <xsd:choice>-->
-<!--                        <xsd:element name="map-key-temporal" type="orm:temporal" minOccurs="0"/>-->
-<!--                        <xsd:element name="map-key-enumerated" type="orm:enumerated" minOccurs="0"/>-->
-<!--                        <xsd:sequence>-->
-<!--                            <xsd:element name="map-key-attribute-override" type="orm:attribute-override" minOccurs="0" maxOccurs="unbounded"/>-->
-<!--                            <xsd:element name="map-key-convert" type="orm:convert" minOccurs="0" maxOccurs="unbounded"/>-->
-<!--                        </xsd:sequence>-->
-<!--                    </xsd:choice>-->
-<!--                    <xsd:choice>-->
-<!--                        <xsd:element name="map-key-column" type="orm:map-key-column" minOccurs="0"/>-->
-<!--                        <xsd:sequence>-->
-<!--                            <xsd:element name="map-key-join-column" type="orm:map-key-join-column" minOccurs="0" maxOccurs="unbounded"/>-->
-<!--                            <xsd:element name="map-key-foreign-key" type="orm:foreign-key" minOccurs="0"/>-->
-<!--                        </xsd:sequence>-->
-<!--                    </xsd:choice>-->
-<!--                </xsd:sequence>-->
-<!--            </xsd:choice>-->
             <xsd:choice>
                 <xsd:sequence>
                     <xsd:element name="join-table" type="orm:join-table" minOccurs="0"/>
@@ -2867,15 +2805,6 @@
         <xsd:sequence>
             <xsd:group ref="collection-structure-group"/>
 
-<!--            <xsd:element name="collection-id" type="orm:collection-id" minOccurs="0"/>-->
-
-<!--            <xsd:element name="order-by" type="orm:order-by" minOccurs="0"/>-->
-<!--            <xsd:element name="order-column" type="orm:order-column" minOccurs="0"/>-->
-<!--            <xsd:element name="sort" type="xsd:string" minOccurs="0" />-->
-<!--            <xsd:element name="sort-natural">-->
-<!--                <xsd:complexType/>-->
-<!--            </xsd:element>-->
-
             <xsd:element name="discriminator" type="orm:hbm-any-discriminator"/>
             <xsd:element name="key" type="orm:hbm-any-key"/>
             <xsd:element name="cascade" type="orm:cascade-type" minOccurs="0"/>