From 3ae06719fd34309e6a5bf31d67d430a07253d2e5 Mon Sep 17 00:00:00 2001
From: John Verhaeg <john.verhaeg@gmail.com>
Date: Fri, 14 Sep 2012 17:22:46 -0500
Subject: [PATCH] HHH-7601: Added minOccurs/maxOccurs to column elements that
 were missing them, as defined by the DTD.

---
 .../main/resources/org/hibernate/hibernate-mapping-4.0.xsd  | 6 +++---
 .../src/test/java/org/hibernate/test/any/AnyTypeTest.java   | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd b/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
index fbd8c4b96a..0b80ce0606 100644
--- a/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
+++ b/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
@@ -788,7 +788,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
         <xs:sequence>
             <xs:element name="meta" minOccurs="0" maxOccurs="unbounded" type="meta-element"/>
             <xs:element name="meta-value" minOccurs="0" maxOccurs="unbounded" type="meta-value-element"/>
-            <xs:element name="column" type="column-element"/>
+            <xs:element name="column" maxOccurs="unbounded" type="column-element"/>
         </xs:sequence>
         <xs:attribute name="access" type="xs:string"/>
         <xs:attribute name="cascade" type="xs:string"/>
@@ -1115,7 +1115,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
     <xs:complexType name="many-to-any-element">
         <xs:sequence>
             <xs:element name="meta-value" minOccurs="0" maxOccurs="unbounded" type="meta-value-element"/>
-            <xs:element name="column" type="column-element"/>
+            <xs:element name="column" minOccurs="2" maxOccurs="unbounded" type="column-element"/>
         </xs:sequence>
         <xs:attribute name="id-type" use="required" type="xs:string"/>
         <xs:attribute name="meta-type" type="xs:string"/>
@@ -1195,7 +1195,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
     </xs:complexType>
     <xs:complexType name="index-many-to-any-element">
         <xs:sequence>
-            <xs:element name="column" type="column-element"/>
+            <xs:element name="column" minOccurs="2" maxOccurs="unbounded" type="column-element"/>
         </xs:sequence>
         <xs:attribute name="id-type" use="required" type="xs:string"/>
         <xs:attribute name="meta-type" type="xs:string"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java
index 5d853018b2..3c7a4966de 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java
@@ -26,7 +26,6 @@
 import org.junit.Test;
 
 import org.hibernate.Session;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
@@ -34,7 +33,6 @@
  * @author Steve Ebersole
  */
 @TestForIssue( jiraKey = "HHH-1663" )
-@FailureExpectedWithNewMetamodel
 public class AnyTypeTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {