Merge pull request citerus#4 from citerus/bump-hibernate

mackos · mackos · commit 38c005a002a5 · 2015-09-20T20:46:29.000+02:00
Bump Hibernate from 3 to 4.
diff --git a/pom.xml b/pom.xml
@@ -169,7 +169,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>3.3.1.GA</version>
+      <version>4.3.5.Final</version>
       <!-- God, what is it with Java and logging frameworks... http://forum.hibernate.org/viewtopic.php?p=2401380 -->
       <exclusions>
         <exclusion>
@@ -178,7 +178,12 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
+      <dependency>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+          <version>3.2.1</version>
+      </dependency>
+      <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.5.6</version>
@@ -198,11 +203,6 @@
       <artifactId>javassist</artifactId>
       <version>3.8.0.GA</version>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.4.0.GA</version>
-    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
@@ -219,9 +219,9 @@
       <version>1.2.2</version>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
+      <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
+      <version>2.3.3</version>
     </dependency>
       <dependency>
           <groupId>javax.servlet</groupId>
diff --git a/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java b/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java
@@ -1,7 +1,7 @@
 package se.citerus.dddsample.application.util;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.classic.Session;
+import org.hibernate.Session;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.PlatformTransactionManager;
diff --git a/src/main/resources/context-infrastructure-persistence.xml b/src/main/resources/context-infrastructure-persistence.xml
@@ -22,12 +22,12 @@
     <property name="defaultAutoCommit" value="false"/>
   </bean>
 
-  <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+  <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
     <property name="dataSource" ref="dataSource"/>
     <property name="configLocation" value="classpath:/hibernate.cfg.xml"/>
   </bean>
 
-  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+  <bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
diff --git a/src/main/resources/context-interfaces.xml b/src/main/resources/context-interfaces.xml
@@ -39,7 +39,7 @@
     <!-- RMI exposed booking service facade, which operates in an open Hibernate session -->
 
 
-    <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate3.HibernateInterceptor">
+    <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate4.support.OpenSessionInterceptor">
         <property name="sessionFactory" ref="sessionFactory"/>
     </bean>
 
@@ -87,7 +87,7 @@
     </bean>
 
     <bean id="openSessionInViewInterceptor"
-          class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+          class="org.springframework.orm.hibernate4.support.OpenSessionInViewInterceptor">
         <property name="sessionFactory" ref="sessionFactory"/>
     </bean>
 
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-configuration PUBLIC
         "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
 
diff --git a/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Cargo.hbm.xml b/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Cargo.hbm.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.cargo.Cargo" table="Cargo">
diff --git a/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovement.hbm.xml b/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovement.hbm.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.voyage.CarrierMovement" table="CarrierMovement" mutable="false">
diff --git a/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEvent.hbm.xml b/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEvent.hbm.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.handling.HandlingEvent" table="HandlingEvent">
diff --git a/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Leg.hbm.xml b/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Leg.hbm.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.cargo.Leg" table="Leg" mutable="false">
diff --git a/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Location.hbm.xml b/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Location.hbm.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.location.Location" table="Location">
diff --git a/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Voyage.hbm.xml b/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Voyage.hbm.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.voyage.Voyage" table="Voyage">
diff --git a/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java b/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java
@@ -1,13 +1,13 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.classic.Session;
+import org.hibernate.Session;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.orm.hibernate4.HibernateTransactionManager;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.TransactionConfiguration;
diff --git a/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovementRepositoryTest.java b/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovementRepositoryTest.java
@@ -6,7 +6,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.orm.hibernate4.HibernateTransactionManager;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.TransactionConfiguration;
diff --git a/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEventRepositoryTest.java b/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEventRepositoryTest.java
@@ -1,13 +1,13 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.classic.Session;
+import org.hibernate.Session;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.orm.hibernate4.HibernateTransactionManager;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.TransactionConfiguration;
diff --git a/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/LocationRepositoryTest.java b/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/LocationRepositoryTest.java
@@ -5,7 +5,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.orm.hibernate4.HibernateTransactionManager;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.TransactionConfiguration;
