From e1a6bb2d2e298134d57ccfb207edbef906d86a3e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 11 Oct 2011 01:08:41 +0000
Subject: [PATCH] committed initial Hibernate 4.0 support

---
 org.springframework.orm/ivy.xml |  2 +
 org.springframework.orm/orm.iml | 70 +++++++++++++++++++++++++++------
 2 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml
index a20167ba391..f68cc1a3560 100644
--- a/org.springframework.orm/ivy.xml
+++ b/org.springframework.orm/ivy.xml
@@ -43,6 +43,8 @@
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="optional, hibernate->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.4.0.GA" conf="optional, hibernate-jpa->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="optional, hibernate-jpa->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="4.0.0.CR4" conf="optional, hibernate->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="4.0.0.CR4" conf="optional, hibernate->compile"/>
 		<dependency org="javax.jdo" name="com.springsource.javax.jdo" rev="2.1.0" conf="provided, jdo->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided, web->compile"/>
diff --git a/org.springframework.orm/orm.iml b/org.springframework.orm/orm.iml
index bd0141a4cbe..b74595c11b7 100644
--- a/org.springframework.orm/orm.iml
+++ b/org.springframework.orm/orm.iml
@@ -79,6 +79,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-3.3.0.ga.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-sources-3.3.0.ga.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -119,6 +130,17 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.lang/2.1.0/com.springsource.org.apache.commons.lang-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.lang/2.1.0/com.springsource.org.apache.commons.lang-sources-2.1.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -199,11 +221,44 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.lang/2.1.0/com.springsource.org.apache.commons.lang-2.1.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/4.0.0.CR4/com.springsource.org.hibernate-4.0.0.CR4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.lang/2.1.0/com.springsource.org.apache.commons.lang-sources-2.1.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/4.0.0.CR4/com.springsource.org.hibernate-sources-4.0.0.CR4.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.ejb/4.0.0.CR4/com.springsource.org.hibernate.ejb-4.0.0.CR4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.ejb/4.0.0.CR4/com.springsource.org.hibernate.ejb-sources-4.0.0.CR4.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.hibernate.common/com.springsource.org.hibernate.annotations.common/4.0.0.CR2/com.springsource.org.hibernate.annotations.common-4.0.0.CR2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.hibernate.common/com.springsource.org.hibernate.annotations.common/4.0.0.CR2/com.springsource.org.hibernate.annotations.common-sources-4.0.0.CR2.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.jboss.logging/com.springsource.org.jboss.logging/3.0.0.GA/com.springsource.org.jboss.logging-3.0.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.jboss.logging/com.springsource.org.jboss.logging/3.0.0.GA/com.springsource.org.jboss.logging-sources-3.0.0.GA.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -216,17 +271,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-3.3.0.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.jboss.javassist/com.springsource.javassist/3.3.0.ga/com.springsource.javassist-sources-3.3.0.ga.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
   </component>
   <component name="copyright">
     <Base>