Add missing @Audited annotations to mapped superclasses

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java
index cbb11bc1e7baa005d55ad6b47d52261c01e731d1..0e2467a1a33b623e016ff6793ae2e63e37a08444 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.IndexedEmbedded;
@@ -37,6 +38,7 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 })
 @XmlRootElement(name = "EventBase")
 @MappedSuperclass
+@Audited
 public abstract class EventBase extends AnnotatableEntity implements IEvent {
        private static final long serialVersionUID = -1859035632758446593L;
        @SuppressWarnings("unused")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
index 1694e1f1c7aaf1ecaf1c629c8ee63e4b6879cf10..6c04a0157d04c63b9e643f93a56f1679575360d6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.FieldBridge;
 import org.hibernate.search.annotations.IndexedEmbedded;
@@ -48,6 +49,7 @@ import eu.etaxonomy.cdm.jaxb.FormattedTextAdapter;
     LanguageString.class
 })
 @MappedSuperclass
+@Audited
 public abstract class LanguageStringBase extends AnnotatableEntity{
     private static final long serialVersionUID = -1892526642162438277L;
     @SuppressWarnings("unused")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
index 0f865b7caf8d1825296066fe7d8a47d367f52408..f8a7450bd0e02cd40b5a7446375abab20fc6371f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
+import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.reference.Reference;
 
@@ -41,6 +42,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 })
 @XmlRootElement(name = "ReferencedEntityBase")
 @MappedSuperclass
+@Audited
 public abstract class ReferencedEntityBase extends AnnotatableEntity implements IReferencedEntity {
        private static final long serialVersionUID = -5614669050360359126L;
        @SuppressWarnings("unused")
@@ -53,7 +55,7 @@ public abstract class ReferencedEntityBase extends AnnotatableEntity implements
     @XmlSchemaType(name = "IDREF")
     @ManyToOne(fetch = FetchType.LAZY)
     @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
-       private Reference citation;
+       private Reference<?> citation;
 
     @XmlElement(name = "CitationMicroReference")
        private String citationMicroReference;

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipBase.java
index f0c9e7b8169b79fb496359612b785d05aca33758..339e2e9ab66989cfd81992b8c0e49e75dc9ebcef 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipBase.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
+import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.reference.Reference;
 
@@ -51,6 +52,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 @XmlType(name = "RelationshipBase")
 @XmlRootElement(name = "RelationshipBase")
 @MappedSuperclass
+@Audited
 public abstract class RelationshipBase<FROM extends IRelated, TO extends IRelated, TYPE extends RelationshipTermBase> extends ReferencedEntityBase implements Cloneable {
     private static final long serialVersionUID = -5030154633820061997L;
     @SuppressWarnings("unused")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
index 6665c8786979a204bd308dc0f72c39142d598c70..ee7fb67b8c85f99ec63362bc6a714d3807e34ab9 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
@@ -31,6 +31,7 @@ import org.hibernate.LazyInitializationException;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Type;
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Field;
 
@@ -50,6 +51,7 @@ import eu.etaxonomy.cdm.strategy.cache.common.TermDefaultCacheStrategy;
     FeatureTree.class
 })
 @MappedSuperclass
+@Audited
 public abstract class TermBase extends IdentifiableEntity<IIdentifiableEntityCacheStrategy >{
     private static final long serialVersionUID = 1471561531632115822L;
     @SuppressWarnings("unused")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
index 2faa9aace6584f0728eeef73c4ec99eddf9520bd..f942606da4763eb82ddf6c0a09b0c4d5eb5a4d81 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
@@ -58,8 +58,8 @@ import eu.etaxonomy.cdm.strategy.match.MatchMode;
     "updatedBy"
 })
 @XmlJavaTypeAdapter(value=DateTimeAdapter.class,type=DateTime.class)
-@Audited
 @MappedSuperclass
+@Audited
 public abstract class VersionableEntity extends CdmBase implements IVersionableEntity{
        private static final long serialVersionUID = 1409299200302758513L;
        @SuppressWarnings("unused")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifiableMediaEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifiableMediaEntity.java
index 93983ffc41d7576088102d0c4975c6f97e0fc08a..3df222680440fcb47125cdf25b95a5f93e30a266 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifiableMediaEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifiableMediaEntity.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
+import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
@@ -37,6 +38,7 @@ import eu.etaxonomy.cdm.strategy.merge.MergeMode;
     "media"
 })
 @MappedSuperclass
+@Audited
 public abstract class IdentifiableMediaEntity<S extends IIdentifiableEntityCacheStrategy> extends IdentifiableEntity<S> implements IMediaDocumented, IMediaEntity{
 
        private static final long serialVersionUID = 4038647011021908313L;
@@ -51,7 +53,7 @@ public abstract class IdentifiableMediaEntity<S extends IIdentifiableEntityCache
        @Cascade({CascadeType.SAVE_UPDATE})
        //TODO
        @Merge(MergeMode.ADD_CLONE)
-       private Set<Media> media = new HashSet<Media>();
+    private Set<Media> media = new HashSet<Media>();
        
        
        /* (non-Javadoc)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
index 34e832e29e3b3c9120055f2ffae89859ae845b6d..d3155ec9f372339070d2c8681b2e24063c2ed781 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
@@ -110,7 +110,7 @@ import eu.etaxonomy.cdm.validation.annotation.ReferenceCheck;
 @Entity\r
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)\r
 @Audited\r
-@javax.persistence.Table(name="Reference")\r
+//@javax.persistence.Table(name="Reference")\r
 @Table(appliesTo="Reference", indexes = { @org.hibernate.annotations.Index(name = "ReferenceTitleCacheIndex", columnNames = { "titleCache" }) })\r
 @InReference(groups = Level2.class)\r
 @ReferenceCheck(groups = Level2.class)\r