Solved inheritance issue in auditing models

17 files changed, 300 insertions, 0 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
index 95255e298..fe82f5160 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
@@ -181,6 +181,9 @@
 		<key>
 			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DEPARTMENT`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`STUDENTAUDITING`">
 		<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
@@ -188,5 +191,8 @@
 		<key>
 			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FACULTY`"/>
+		</property>
 	</joined-subclass>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
index 1ef8658fe..7cd77fa17 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
@@ -196,9 +196,15 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="EmployeeAuditing">
 		<meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+		<property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DEPARTMENT`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="StudentAuditing">
 		<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FACULTY`"/>
+		</property>
 	</subclass>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml
index 9dc925563..a1e6c3a25 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml
@@ -170,9 +170,15 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="EmployeeAuditing">
 		<meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+		<property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DEPARTMENT`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="StudentAuditing">
 		<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+		<property name="faculty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FACULTY`"/>
+		</property>
 	</subclass>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml
index ea292217f..29dbdb810 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml
@@ -113,6 +113,13 @@
 		<key>
 			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<list name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
+			<key update="true">
+				<column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`PARENTAUDITING_CHILDREN_IDX`"/>
+			<element type="java.lang.String"/>
+		</list>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`CHILDAUDITING`">
 		<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml
index ab2a090a0..3b1dcb789 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml
@@ -111,6 +111,13 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ParentAuditing">
 		<meta attribute="eclassName" inherit="false">ParentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
+		<list name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
+			<key update="true">
+				<column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`PARENTAUDITING_CHILDREN_IDX`"/>
+			<element type="java.lang.String"/>
+		</list>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ChildAuditing">
 		<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml
index 1917f6a21..daa7946a3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml
@@ -171,6 +171,27 @@
 		<key>
 			<column name="`ALSOEMBEDDABLEAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="anotherName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ANOTHERNAME`"/>
+		</property>
+		<list name="aOneToMany" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key update="true">
+				<column name="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_IDX`"/>
+			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
+				<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+					<column not-null="true" unique="false" name="`NAME`"/>
+				</property>
+			</composite-element>
+		</list>
+		<component name="nestedEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.NestedEmbeddableImpl">
+			<meta attribute="eclassName" inherit="false">NestedEmbeddable</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
+			<property name="nestedName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+				<column not-null="true" unique="false" name="`NESTEDEMBEDDED_NESTEDNAME`"/>
+			</property>
+		</component>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AOneToManyAuditing" abstract="false" lazy="false" table="`AONETOMANYAUDITING`">
 		<meta attribute="eclassName" inherit="false">AOneToManyAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml
index 95fd7048a..eb213d16c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml
@@ -177,6 +177,27 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AnotherEmbeddableAuditing" abstract="false" lazy="false" extends="AlsoEmbeddableAuditing" discriminator-value="AnotherEmbeddableAuditing">
 		<meta attribute="eclassName" inherit="false">AnotherEmbeddableAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedAuditing</meta>
+		<property name="anotherName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ANOTHERNAME`"/>
+		</property>
+		<list name="aOneToMany" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key update="true">
+				<column name="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_IDX`"/>
+			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
+				<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+					<column not-null="false" unique="false" name="`NAME`"/>
+				</property>
+			</composite-element>
+		</list>
+		<component name="nestedEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.NestedEmbeddableImpl">
+			<meta attribute="eclassName" inherit="false">NestedEmbeddable</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
+			<property name="nestedName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`NESTEDEMBEDDED_NESTEDNAME`"/>
+			</property>
+		</component>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AOneToManyAuditing" abstract="false" lazy="false" discriminator-value="AOneToManyAuditing" table="`AONETOMANYAUDITING`">
 		<meta attribute="eclassName" inherit="false">AOneToManyAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml
index 055278bd1..30c4a783c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml
@@ -309,6 +309,9 @@
 		<key>
 			<column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`POSTCODE`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" table="`DISTRICTUKADDRESSAUDITING`">
 		<meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
@@ -316,6 +319,9 @@
 		<key>
 			<column name="`UKADDRESSAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DISTRICT`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" table="`PRICEAUDITING`">
 		<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -372,6 +378,9 @@
 		<key>
 			<column name="`PRICEAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CURRENCY`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" table="`USADDRESSAUDITING`">
 		<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
@@ -379,6 +388,17 @@
 		<key>
 			<column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`STATE`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`ZIP`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" table="`CUSTOMERAUDITING`">
 		<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -432,6 +452,9 @@
 		<key>
 			<column name="`CUSTOMERAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPECIFICNAME`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" table="`UKADDRESSLISTAUDITING`">
 		<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml
index b5f8930a2..5ba8049ec 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml
@@ -324,10 +324,16 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`POSTCODE`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DISTRICT`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" discriminator-value="PriceAuditing" table="`PRICEAUDITING`">
 		<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -384,10 +390,24 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
 		<meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CURRENCY`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
 		<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`STATE`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`ZIP`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" discriminator-value="CustomerAuditing" table="`CUSTOMERAUDITING`">
 		<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -441,6 +461,9 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
 		<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPECIFICNAME`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" discriminator-value="UKAddressListAuditing" table="`UKADDRESSLISTAUDITING`">
 		<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml
index 7f62b5530..9f520dda0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml
@@ -309,10 +309,16 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`POSTCODE`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DISTRICT`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="PriceAuditing">
 		<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -327,10 +333,24 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
 		<meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CURRENCY`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
 		<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`STATE`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`ZIP`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="CustomerAuditing">
 		<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -342,6 +362,9 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
 		<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPECIFICNAME`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="UKAddressListAuditing">
 		<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml
index 055278bd1..30c4a783c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml
@@ -309,6 +309,9 @@
 		<key>
 			<column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`POSTCODE`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" table="`DISTRICTUKADDRESSAUDITING`">
 		<meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
@@ -316,6 +319,9 @@
 		<key>
 			<column name="`UKADDRESSAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DISTRICT`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" table="`PRICEAUDITING`">
 		<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -372,6 +378,9 @@
 		<key>
 			<column name="`PRICEAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CURRENCY`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" table="`USADDRESSAUDITING`">
 		<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
@@ -379,6 +388,17 @@
 		<key>
 			<column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`STATE`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`ZIP`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" table="`CUSTOMERAUDITING`">
 		<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -432,6 +452,9 @@
 		<key>
 			<column name="`CUSTOMERAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPECIFICNAME`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" table="`UKADDRESSLISTAUDITING`">
 		<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml
index b5f8930a2..5ba8049ec 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml
@@ -324,10 +324,16 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`POSTCODE`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DISTRICT`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" discriminator-value="PriceAuditing" table="`PRICEAUDITING`">
 		<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -384,10 +390,24 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
 		<meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CURRENCY`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
 		<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`STATE`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`ZIP`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" discriminator-value="CustomerAuditing" table="`CUSTOMERAUDITING`">
 		<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -441,6 +461,9 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
 		<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPECIFICNAME`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" discriminator-value="UKAddressListAuditing" table="`UKADDRESSLISTAUDITING`">
 		<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml
index d928ff6d0..8e119a46e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml
@@ -302,10 +302,16 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`POSTCODE`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
 		<meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`DISTRICT`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="PriceAuditing">
 		<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -320,10 +326,24 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
 		<meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CURRENCY`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
 		<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
+			<column not-null="false" unique="false" name="`STATE`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
+				<param name="eclassifier">USState</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
+			</type>
+		</property>
+		<property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
+			<column not-null="false" unique="false" name="`ZIP`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="CustomerAuditing">
 		<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -335,6 +355,9 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
 		<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
+		<property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPECIFICNAME`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="UKAddressListAuditing">
 		<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml
index c1a9d0c3f..de1b38a43 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml
@@ -136,6 +136,9 @@
 		<key>
 			<column name="`DOCUMENTAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`NAME`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" table="`PARENTDOCUMENTAUDITING`">
 		<meta attribute="eclassName" inherit="false">ParentDocumentAuditing</meta>
@@ -143,6 +146,9 @@
 		<key>
 			<column name="`DOCUMENTAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MYNAME`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificDocumentAuditing" abstract="false" lazy="false" extends="ParentDocumentAuditing" table="`SPECIFICDOCUMENTAUDITING`">
 		<meta attribute="eclassName" inherit="false">SpecificDocumentAuditing</meta>
@@ -150,6 +156,9 @@
 		<key>
 			<column name="`PARENTDOCUMENTAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MYSPECIFICINFO`"/>
+		</property>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestReferenceAuditing" abstract="false" lazy="false" table="`TESTREFERENCEAUDITING`">
 		<meta attribute="eclassName" inherit="false">TestReferenceAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml
index 7025a41f3..7ae125d56 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml
@@ -148,14 +148,23 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AddIDDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" discriminator-value="AddIDDocumentAuditing">
 		<meta attribute="eclassName" inherit="false">AddIDDocumentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
+		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`NAME`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" discriminator-value="ParentDocumentAuditing">
 		<meta attribute="eclassName" inherit="false">ParentDocumentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
+		<property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MYNAME`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificDocumentAuditing" abstract="false" lazy="false" extends="ParentDocumentAuditing" discriminator-value="SpecificDocumentAuditing">
 		<meta attribute="eclassName" inherit="false">SpecificDocumentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
+		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MYSPECIFICINFO`"/>
+		</property>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestReferenceAuditing" abstract="false" lazy="false" discriminator-value="TestReferenceAuditing" table="`TESTREFERENCEAUDITING`">
 		<meta attribute="eclassName" inherit="false">TestReferenceAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml
index be2b486a8..b9d6af2ef 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml
@@ -154,6 +154,25 @@
 		<key>
 			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<meta attribute="eclassName" inherit="false">Address</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`OTHER_NAME`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`OTHER_STREET`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`OTHER_CITY`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`ADDR_COUNTRY`"/>
+			</many-to-one>
+		</component>
+		<property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`EMPLOYEENUMBER`"/>
+		</property>
 	</joined-subclass>
 	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NonEmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`NONEMPLOYEEAUDITING`">
 		<meta attribute="eclassName" inherit="false">NonEmployeeAuditing</meta>
@@ -161,6 +180,22 @@
 		<key>
 			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<meta attribute="eclassName" inherit="false">Address</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`ADDRESS_NAME`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`ADDRESS_STREET`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`ADDRESS_CITY`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`COUNTRY_COUNTRY_E_ID`"/>
+			</many-to-one>
+		</component>
 	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CountryAuditing" abstract="false" lazy="false" table="`COUNTRYAUDITING`">
 		<meta attribute="eclassName" inherit="false">CountryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml
index 3b6d41ec0..edf977a8d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml
@@ -160,10 +160,45 @@
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="EmployeeAuditing">
 		<meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<meta attribute="eclassName" inherit="false">Address</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`OTHER_NAME`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`OTHER_STREET`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`OTHER_CITY`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`ADDR_COUNTRY`"/>
+			</many-to-one>
+		</component>
+		<property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`EMPLOYEENUMBER`"/>
+		</property>
 	</subclass>
 	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NonEmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="NonEmployeeAuditing">
 		<meta attribute="eclassName" inherit="false">NonEmployeeAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<meta attribute="eclassName" inherit="false">Address</meta>
+			<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+			<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`ADDRESS_NAME`"/>
+			</property>
+			<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`ADDRESS_STREET`"/>
+			</property>
+			<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+				<column not-null="false" unique="false" name="`ADDRESS_CITY`"/>
+			</property>
+			<many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`COUNTRY_COUNTRY_E_ID`"/>
+			</many-to-one>
+		</component>
 	</subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CountryAuditing" abstract="false" lazy="false" discriminator-value="CountryAuditing" table="`COUNTRYAUDITING`">
 		<meta attribute="eclassName" inherit="false">CountryAuditing</meta>