BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 723a16f)
ref #8162 updates to hibernate.cfg.xml
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 5 Mar 2019 10:21:57 +0000 (11:21 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 15 Apr 2019 13:53:00 +0000 (15:53 +0200)
cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml patch | blob | history
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml patch | blob | history
cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml patch | blob | history

diff --git a/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml b/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
index 4697ef453326bad1d5279993d535aa07705339d3..5b9f85e1daab1c2204654ae2537aa3722cc146b8 100644 (file)
--- a/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
+++ b/cdmlib-cache/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
@@ -62,7 +62,8 @@ Difference are to be found in
                        hibernate.c3p0.validate
       -->
       <mapping package="eu.etaxonomy.cdm.model.common"/>
-      <!-- Annotation Package -->
+      
+      <!-- Agent Package -->
       <mapping class="eu.etaxonomy.cdm.model.agent.Address"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.AgentBase"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.Contact"/>
@@ -71,12 +72,11 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.agent.Person"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.Team"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.TeamOrPersonBase"/>
+      
       <!-- Common Package -->
       <mapping class="eu.etaxonomy.cdm.model.common.Annotation"/>
       <mapping class="eu.etaxonomy.cdm.model.common.AnnotationType"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Credit"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTerm"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTermBase"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Extension"/>
       <mapping class="eu.etaxonomy.cdm.model.common.ExtensionType"/>
       <mapping class="eu.etaxonomy.cdm.model.common.IdentifiableSource"/>
@@ -90,14 +90,10 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.common.LSIDAuthority"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Marker"/>
       <mapping class="eu.etaxonomy.cdm.model.common.MarkerType"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTerm"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermBase"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermVocabulary"/>
       <mapping class="eu.etaxonomy.cdm.model.common.OriginalSourceBase"/>
       <mapping class="eu.etaxonomy.cdm.model.common.RelationshipTermBase"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.Representation"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>
       <mapping class="eu.etaxonomy.cdm.model.common.User"/>
+      
       <!-- Description Package -->
       <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>
       <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>
@@ -129,6 +125,7 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.description.TextData"/>
       <mapping class="eu.etaxonomy.cdm.model.description.TextFormat"/>
       <mapping class="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"/>
+      
       <!-- Location Package -->
       <mapping class="eu.etaxonomy.cdm.model.location.NamedArea"/>
       <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaLevel"/>
@@ -136,6 +133,7 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.location.ReferenceSystem"/>
       <mapping class="eu.etaxonomy.cdm.model.location.Point"/>
       <mapping class="eu.etaxonomy.cdm.model.location.Country"/>
+      
       <!-- Media Package -->
       <mapping class="eu.etaxonomy.cdm.model.media.AudioFile"/>
       <mapping class="eu.etaxonomy.cdm.model.media.ExternalLink"/>
@@ -146,9 +144,11 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.media.MovieFile"/>
       <mapping class="eu.etaxonomy.cdm.model.media.Rights"/>
       <mapping class="eu.etaxonomy.cdm.model.media.RightsType"/>
+      
       <!-- Meta Data Package -->
       <mapping class="eu.etaxonomy.cdm.model.metadata.CdmMetaData"/>
       <mapping class="eu.etaxonomy.cdm.model.metadata.CdmPreference"/>
+      
       <!-- Molecular Package -->
       <mapping class="eu.etaxonomy.cdm.model.molecular.PhylogeneticTree"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>
@@ -161,6 +161,7 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>
+      
       <!-- Name Package -->
       <mapping class="eu.etaxonomy.cdm.model.name.HomotypicalGroup"/>
       <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationship"/>
@@ -191,6 +192,7 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"/>
+      
       <!-- Reference Package -->
       <mapping class="eu.etaxonomy.cdm.model.reference.Reference"/>
 
@@ -205,6 +207,15 @@ Difference are to be found in
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>
       
+      <!-- Term Package -->
+      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermVocabulary"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.Representation"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.TermVocabulary"/>
+      
       <!-- Validation Package -->
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidation"/>
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityConstraintViolation"/>
diff --git a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
index 21ea3486df72d42a79f9ea2add8616b7aa892540..931d8be7a6422f3955f80620c3abd29c7b77ee43 100644 (file)
--- a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
+++ b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
@@ -51,7 +51,8 @@
                        hibernate.c3p0.validate
       -->
       <mapping package="eu.etaxonomy.cdm.model.common"/>
-      <!-- Annotation Package -->
+      
+      <!-- Agent Package -->
       <mapping class="eu.etaxonomy.cdm.model.agent.Address"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.AgentBase"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.Contact"/>
@@ -60,12 +61,11 @@
       <mapping class="eu.etaxonomy.cdm.model.agent.Person"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.Team"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.TeamOrPersonBase"/>
+      
       <!-- Common Package -->
       <mapping class="eu.etaxonomy.cdm.model.common.Annotation"/>
       <mapping class="eu.etaxonomy.cdm.model.common.AnnotationType"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Credit"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTerm"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTermBase"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Extension"/>
       <mapping class="eu.etaxonomy.cdm.model.common.ExtensionType"/>
       <mapping class="eu.etaxonomy.cdm.model.common.IdentifiableSource"/>
@@ -79,14 +79,10 @@
       <mapping class="eu.etaxonomy.cdm.model.common.LSIDAuthority"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Marker"/>
       <mapping class="eu.etaxonomy.cdm.model.common.MarkerType"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTerm"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermBase"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermVocabulary"/>
       <mapping class="eu.etaxonomy.cdm.model.common.OriginalSourceBase"/>
       <mapping class="eu.etaxonomy.cdm.model.common.RelationshipTermBase"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.Representation"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>
       <mapping class="eu.etaxonomy.cdm.model.common.User"/>
+      
       <!-- Description Package -->
       <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>
       <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>
@@ -118,6 +114,7 @@
       <mapping class="eu.etaxonomy.cdm.model.description.TextData"/>
       <mapping class="eu.etaxonomy.cdm.model.description.TextFormat"/>
       <mapping class="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"/>
+      
       <!-- Location Package -->
       <mapping class="eu.etaxonomy.cdm.model.location.NamedArea"/>
       <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaLevel"/>
@@ -125,6 +122,7 @@
       <mapping class="eu.etaxonomy.cdm.model.location.ReferenceSystem"/>
       <mapping class="eu.etaxonomy.cdm.model.location.Point"/>
       <mapping class="eu.etaxonomy.cdm.model.location.Country"/>
+      
       <!-- Media Package -->
       <mapping class="eu.etaxonomy.cdm.model.media.AudioFile"/>
       <mapping class="eu.etaxonomy.cdm.model.media.ExternalLink"/>
@@ -135,9 +133,11 @@
       <mapping class="eu.etaxonomy.cdm.model.media.MovieFile"/>
       <mapping class="eu.etaxonomy.cdm.model.media.Rights"/>
       <mapping class="eu.etaxonomy.cdm.model.media.RightsType"/>
+      
       <!-- Meta Data Package -->
       <mapping class="eu.etaxonomy.cdm.model.metadata.CdmMetaData"/>
       <mapping class="eu.etaxonomy.cdm.model.metadata.CdmPreference"/>
+      
       <!-- Molecular Package -->
       <mapping class="eu.etaxonomy.cdm.model.molecular.PhylogeneticTree"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>
@@ -150,6 +150,7 @@
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>
+      
       <!-- Name Package -->
       <mapping class="eu.etaxonomy.cdm.model.name.HomotypicalGroup"/>
       <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationship"/>
@@ -180,6 +181,7 @@
       <mapping class="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"/>
+      
       <!-- Reference Package -->
       <mapping class="eu.etaxonomy.cdm.model.reference.Reference"/>
 
@@ -194,6 +196,15 @@
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>
       
+      <!-- Term Package -->
+      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermVocabulary"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.Representation"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.TermVocabulary"/>
+      
       <!-- Validation Package -->
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidation"/>
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityConstraintViolation"/>
diff --git a/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml b/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
index 4518ec3d7352b393a61fbc561cd3efe97fbcea16..931d8be7a6422f3955f80620c3abd29c7b77ee43 100644 (file)
--- a/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
+++ b/cdmlib-test/src/test/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
@@ -51,6 +51,7 @@
                        hibernate.c3p0.validate
       -->
       <mapping package="eu.etaxonomy.cdm.model.common"/>
+      
       <!-- Agent Package -->
       <mapping class="eu.etaxonomy.cdm.model.agent.Address"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.AgentBase"/>
@@ -60,12 +61,11 @@
       <mapping class="eu.etaxonomy.cdm.model.agent.Person"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.Team"/>
       <mapping class="eu.etaxonomy.cdm.model.agent.TeamOrPersonBase"/>
+      
       <!-- Common Package -->
       <mapping class="eu.etaxonomy.cdm.model.common.Annotation"/>
       <mapping class="eu.etaxonomy.cdm.model.common.AnnotationType"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Credit"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTerm"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.DefinedTermBase"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Extension"/>
       <mapping class="eu.etaxonomy.cdm.model.common.ExtensionType"/>
       <mapping class="eu.etaxonomy.cdm.model.common.IdentifiableSource"/>
@@ -79,14 +79,10 @@
       <mapping class="eu.etaxonomy.cdm.model.common.LSIDAuthority"/>
       <mapping class="eu.etaxonomy.cdm.model.common.Marker"/>
       <mapping class="eu.etaxonomy.cdm.model.common.MarkerType"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTerm"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermBase"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.OrderedTermVocabulary"/>
       <mapping class="eu.etaxonomy.cdm.model.common.OriginalSourceBase"/>
       <mapping class="eu.etaxonomy.cdm.model.common.RelationshipTermBase"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.Representation"/>
-      <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>
       <mapping class="eu.etaxonomy.cdm.model.common.User"/>
+      
       <!-- Description Package -->
       <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>
       <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>
@@ -118,6 +114,7 @@
       <mapping class="eu.etaxonomy.cdm.model.description.TextData"/>
       <mapping class="eu.etaxonomy.cdm.model.description.TextFormat"/>
       <mapping class="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"/>
+      
       <!-- Location Package -->
       <mapping class="eu.etaxonomy.cdm.model.location.NamedArea"/>
       <mapping class="eu.etaxonomy.cdm.model.location.NamedAreaLevel"/>
@@ -125,6 +122,7 @@
       <mapping class="eu.etaxonomy.cdm.model.location.ReferenceSystem"/>
       <mapping class="eu.etaxonomy.cdm.model.location.Point"/>
       <mapping class="eu.etaxonomy.cdm.model.location.Country"/>
+      
       <!-- Media Package -->
       <mapping class="eu.etaxonomy.cdm.model.media.AudioFile"/>
       <mapping class="eu.etaxonomy.cdm.model.media.ExternalLink"/>
@@ -135,9 +133,11 @@
       <mapping class="eu.etaxonomy.cdm.model.media.MovieFile"/>
       <mapping class="eu.etaxonomy.cdm.model.media.Rights"/>
       <mapping class="eu.etaxonomy.cdm.model.media.RightsType"/>
+      
       <!-- Meta Data Package -->
       <mapping class="eu.etaxonomy.cdm.model.metadata.CdmMetaData"/>
       <mapping class="eu.etaxonomy.cdm.model.metadata.CdmPreference"/>
+      
       <!-- Molecular Package -->
       <mapping class="eu.etaxonomy.cdm.model.molecular.PhylogeneticTree"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>
@@ -150,6 +150,7 @@
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>
       <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>
+      
       <!-- Name Package -->
       <mapping class="eu.etaxonomy.cdm.model.name.HomotypicalGroup"/>
       <mapping class="eu.etaxonomy.cdm.model.name.HybridRelationship"/>
@@ -167,6 +168,7 @@
       <mapping class="eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus"/>
       <mapping class="eu.etaxonomy.cdm.model.name.TaxonName"/>
       <mapping class="eu.etaxonomy.cdm.model.name.TypeDesignationBase"/>
+      
       <!-- Occurrence Package -->
       <mapping class="eu.etaxonomy.cdm.model.occurrence.Collection"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.DerivationEvent"/>
@@ -179,6 +181,7 @@
       <mapping class="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.PreservationMethod"/>
       <mapping class="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"/>
+      
       <!-- Reference Package -->
       <mapping class="eu.etaxonomy.cdm.model.reference.Reference"/>
 
@@ -193,6 +196,15 @@
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"/>
       <mapping class="eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType"/>
       
+      <!-- Term Package -->
+      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTerm"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermBase"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermVocabulary"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.Representation"/>
+      <mapping class="eu.etaxonomy.cdm.model.term.TermVocabulary"/>
+      
       <!-- Validation Package -->
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityValidation"/>
       <mapping class="eu.etaxonomy.cdm.model.validation.EntityConstraintViolation"/>