Update Hibernate config namespace to fix deprecation

BernhardWebstudio · Jan 13, 2020 · 83209a8 · 83209a8
1 parent a6f6777
commit 83209a8
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,6 @@
 # Changelog
 
 ## v1.10.2-SNAPSHOT
-* [[`029100c95a`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/029100c95a)] - Update changelog & publish Version (Tim Bernhard)
 * [[`f9820ad0e5`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/f9820ad0e5)] - Try to improve feedback by app when switching/saving/copying (too fast?) (Tim Bernhard)
 * [[`c3656fc15c`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/c3656fc15c)] - Reformat code (Tim Bernhard)
 * [[`191bdd4729`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/191bdd4729)] - Possibly fix issue (#22) where georeference got lost after saving twice (Tim Bernhard)
@@ -15,15 +14,11 @@
 * [[`93e66caf44`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/93e66caf44)] - Merge branch 'master' of github.com:BernhardWebstudio/DataShot\_DesktopApp (Tim Bernhard)
 * [[`e6eacd38e2`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/e6eacd38e2)] - Improve menu & about dialog phrasing (Tim Bernhard)
 * [[`b9d4261948`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/b9d4261948)] - Use HibernateUtil instead of Factory to get hibernate properties for database migration (Tim Bernhard)
-* [[`4241aacb97`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/4241aacb97)] - Update changelog & publish Version 1.10.1-SNAPSHOT (Tim Bernhard)
-
 
 ## v1.10.1-SNAPSHOT
 * [[`52de6c0489`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/52de6c0489)] - Fix issue where copy-previous led to empty georeference (Tim Bernhard)
 * [[`1f4c5adc9a`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/1f4c5adc9a)] - Update georeference button after copy previous (Tim Bernhard)
 * [[`27414f4ac1`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/27414f4ac1)] - Fix issue where save was impossible after copy previous (Tim Bernhard)
-* [[`d60dbd6815`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/d60dbd6815)] - Update changelog & publish Version 1.10.0-SNAPSHOT (Tim Bernhard)
-
 
 ## v1.10.0-SNAPSHOT
 * [[`edacdc0874`](https://github.com/BernhardWebstudio/DataShot_DesktopApp/commit/edacdc0874)] - Exclude more comparisons in LatLong emptycheck – fix #20, ETHEntColl/DataShot\_DesktopApp\_ETH#9 (Tim Bernhard)

diff --git a/DataShot.iml b/DataShot.iml
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/AllowedVersion.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/AllowedVersion.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.AllowedVersion" table="allowed_version">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Collector.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Collector.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.Collector" table="Collector">
@@ -10,8 +10,7 @@
                 <param name="sequence">SEQ_COLLECTORID</param>
             </generator>
         </id>
-        <many-to-one name="specimen" class="edu.harvard.mcz.imagecapture.entity.Specimen" fetch="join"
-                     cascade="save-update">
+        <many-to-one name="specimen" class="edu.harvard.mcz.imagecapture.entity.Specimen" fetch="join" cascade="save-update">
             <column name="SpecimenId" not-null="true"/>
         </many-to-one>
         <property name="collectorName" type="string">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Determination.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Determination.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.Determination" table="Determination">
@@ -11,7 +11,8 @@
             </generator>
         </id>
         <many-to-one name="specimen" class="edu.harvard.mcz.imagecapture.entity.Specimen">
-            <column name="SpecimenId"/><!-- TODO: rethink nullability -->
+            <column name="SpecimenId"/>
+            <!-- TODO: rethink nullability -->
         </many-to-one>
         <property name="genus" type="string">
             <column name="Genus" length="40"/>

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/ExternalHistory.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/ExternalHistory.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.ExternalHistory" table="external_history">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/HigherTaxon.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/HigherTaxon.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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>
     <class name="edu.harvard.mcz.imagecapture.entity.HigherTaxon" table="HIGHER_TAXON">
         <id name="id" type="java.lang.Integer">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Image.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Image.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping default-lazy="false">
     <class name="edu.harvard.mcz.imagecapture.entity.ICImage" table="Image">
@@ -41,4 +41,4 @@
             <column name="MD5SUM" length="900"/>
         </property>
     </class>
-</hibernate-mapping>
+</hibernate-mapping>
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/LatLong.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/LatLong.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.LatLong" table="LAT_LONG">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/MCZbaseAuthAgentName.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/MCZbaseAuthAgentName.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.MCZbaseAuthAgentName" table="MCZBASE_AUTH_AGENT_NAME">
@@ -22,4 +22,4 @@
             <column name="AGENT_NAME" length="184"/>
         </property>
     </class>
-</hibernate-mapping> 
+</hibernate-mapping> 
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/MCZbaseGeogAuthRec.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/MCZbaseGeogAuthRec.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.MCZbaseGeogAuthRec" table="MCZBASE_GEOG_AUTH_REC">
@@ -52,4 +52,4 @@
             <column name="OCEAN_SUBREGION" length="50"/>
         </property>
     </class>
-</hibernate-mapping> 
+</hibernate-mapping> 
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Number.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Number.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.Number" table="OTHER_NUMBERS">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Specimen.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Specimen.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping default-lazy="false">
     <class name="edu.harvard.mcz.imagecapture.entity.Specimen" table="Specimen">
@@ -200,25 +200,25 @@
             <column name="externalWorkflowDate"/>
         </property>
         <!-- TODO: rethink nullability of related columns -->
-        <set name="collectors" cascade="all-delete-orphan" fetch="subselect">
+        <set name="collectors" cascade="all" fetch="subselect">
             <key>
-                <column name="SpecimenId"/>
+                <column name="SpecimenId" />
             </key>
-            <one-to-many class="edu.harvard.mcz.imagecapture.entity.Collector"/>
+            <one-to-many class="edu.harvard.mcz.imagecapture.entity.Collector" />
         </set>
-        <set name="determinations" cascade="all-delete-orphan" fetch="subselect">
+        <set name="determinations" cascade="all" fetch="subselect">
             <key>
-                <column name="SpecimenId"/>
+                <column name="SpecimenId" />
             </key>
-            <one-to-many class="edu.harvard.mcz.imagecapture.entity.Determination"/>
+            <one-to-many class="edu.harvard.mcz.imagecapture.entity.Determination" />
         </set>
         <set name="trackings" inverse="true" fetch="subselect">
             <key>
                 <column name="SpecimenId"/>
             </key>
             <one-to-many class="edu.harvard.mcz.imagecapture.entity.Tracking"/>
         </set>
-        <set name="numbers" cascade="all-delete-orphan" fetch="subselect">
+        <set name="numbers" cascade="all" fetch="subselect">
             <key>
                 <column name="SpecimenId"/>
             </key>
@@ -230,7 +230,7 @@
             </key>
             <one-to-many class="edu.harvard.mcz.imagecapture.entity.ICImage"/>
         </set>
-        <set name="specimenParts" cascade="all-delete-orphan" fetch="subselect">
+        <set name="specimenParts" cascade="all" fetch="subselect">
             <key>
                 <column name="SpecimenId"/>
             </key>

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/SpecimenPart.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/SpecimenPart.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.SpecimenPart" table="Specimen_Part">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/SpecimenPartAttribute.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/SpecimenPartAttribute.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping default-lazy="false">
     <class name="edu.harvard.mcz.imagecapture.entity.SpecimenPartAttribute" table="Specimen_Part_Attribute">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Template.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Template.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping default-lazy="false">
     <class name="edu.harvard.mcz.imagecapture.entity.Template" table="Template">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Tracking.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Tracking.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Jan 23, 2009 8:12:35 AM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.Tracking" table="Tracking">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/UnitTrayLabel.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/UnitTrayLabel.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!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-lazy="false">
     <class name="edu.harvard.mcz.imagecapture.entity.UnitTrayLabel" table="UNIT_TRAY_LABEL">
         <id name="id" type="java.lang.Long">

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/entity/Users.hbm.xml b/src/main/java/edu/harvard/mcz/imagecapture/entity/Users.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!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">
 <!-- Generated Feb 5, 2009 5:23:55 PM by Hibernate Tools 3.2.2.GA -->
 <hibernate-mapping>
     <class name="edu.harvard.mcz.imagecapture.entity.Users" table="Users">

diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!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>
     <session-factory>
         <!-- profile specific db config -->