From 0a7b4e0e016556133a06c7bc13069044f5c0d2a4 Mon Sep 17 00:00:00 2001
From: Martin Taal
Date: Fri, 2 Nov 2012 17:01:21 +0100
Subject: added auditing support for emap

---
 .../CarAction_hsqldb_e_o_hibernate.hbm.xml         |  22 ++--
 .../CarAction_hsqldb_h_o_hibernate.hbm.xml         |  25 ++---
 .../JuliaAction_hsqldb_e_o_hibernate.hbm.xml       |  46 +++++++--
 .../JuliaAction_hsqldb_h_o_hibernate.hbm.xml       |  49 ++++++---
 .../MindMapAction_hsqldb_e_o_hibernate.hbm.xml     |  22 ++--
 .../MindMapAction_hsqldb_h_o_hibernate.hbm.xml     |  25 ++---
 .../PlayAction_hsqldb_e_o_hibernate.hbm.xml        | 112 ++++++++++++++++++--
 .../PlayAction_hsqldb_h_o_hibernate.hbm.xml        | 115 ++++++++++++++++++---
 .../PrimerPOAction_hsqldb_e_o_hibernate.hbm.xml    |  28 +++--
 .../PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml    |  31 +++---
 .../SunBooksAction_hsqldb_e_o_hibernate.hbm.xml    |  22 ++--
 .../SunBooksAction_hsqldb_h_o_hibernate.hbm.xml    |  25 ++---
 12 files changed, 372 insertions(+), 150 deletions(-)

(limited to 'tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample')

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml
index 80ffb936b..249ed9d95 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_e_o_hibernate.hbm.xml
@@ -425,7 +425,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="carAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsdAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
@@ -444,7 +444,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CARAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -464,16 +464,13 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="carAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="carsList" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CARSLIST`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="carAuditing.DocumentRootAuditing_mixed" lazy="false" table="`CARAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">carAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -481,6 +478,9 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="carsList" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_CARSLIST`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml
index 683f459fc..2a8f817f5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/CarAction_hsqldb_h_o_hibernate.hbm.xml
@@ -464,16 +464,13 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" discriminator-value="DocumentRootAuditing" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="carAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.example.com/car.xsdAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
 			<generator class="native"/>
 		</id>
-		<discriminator type="string">
-			<column name="`DTYPE`" index="DOCUMENTROOTAUDITINGDTYPE" length="255" not-null="true"/>
-		</discriminator>
 		<version name="teneo_version" type="long">
 			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
 		</version>
@@ -486,7 +483,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CARAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -506,16 +503,13 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="carAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="carsList" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CARSLIST`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="carAuditing.DocumentRootAuditing_mixed" lazy="false" table="`CARAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">carAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -523,6 +517,9 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="carsList" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_CARSLIST`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml
index e194575a4..05f330ff1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_e_o_hibernate.hbm.xml
@@ -423,7 +423,7 @@
 			<column not-null="false" unique="false" name="`PUBLISHERDEFINITIONREF`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="testAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsdAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
@@ -442,7 +442,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -462,16 +462,25 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="testAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="abstractBookDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ABSTRACTBOOKDEFINITION`"/>
+		</property>
+		<property name="adultBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ADULTBOOKS`"/>
+		</property>
+		<property name="booksinlib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`BOOKSINLIB`"/>
+		</property>
+		<property name="childrenBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CHILDRENBOOKS`"/>
+		</property>
+		<property name="publisherDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PUBLISHERDEFINITION`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="testAuditing.DocumentRootAuditing_mixed" lazy="false" table="`TESTAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">testAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -479,6 +488,21 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="abstractBookDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ABSTRACTBOOKDEFINITION`"/>
+		</property>
+		<property name="adultBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ADULTBOOKS`"/>
+		</property>
+		<property name="booksinlib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_BOOKSINLIB`"/>
+		</property>
+		<property name="childrenBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_CHILDRENBOOKS`"/>
+		</property>
+		<property name="publisherDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PUBLISHERDEFINITION`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml
index 3304625e9..91db51e96 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/JuliaAction_hsqldb_h_o_hibernate.hbm.xml
@@ -441,16 +441,13 @@
 			<column not-null="false" unique="false" name="`PUBLISHERDEFINITIONREF`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" discriminator-value="DocumentRootAuditing" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="testAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.ibm.com/websphere/appserver/schemas/6.0/ibm-portal-test.xsdAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
 			<generator class="native"/>
 		</id>
-		<discriminator type="string">
-			<column name="`DTYPE`" index="DOCUMENTROOTAUDITINGDTYPE" length="255" not-null="true"/>
-		</discriminator>
 		<version name="teneo_version" type="long">
 			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
 		</version>
@@ -463,7 +460,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -483,16 +480,25 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="testAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="abstractBookDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ABSTRACTBOOKDEFINITION`"/>
+		</property>
+		<property name="adultBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ADULTBOOKS`"/>
+		</property>
+		<property name="booksinlib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`BOOKSINLIB`"/>
+		</property>
+		<property name="childrenBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`CHILDRENBOOKS`"/>
+		</property>
+		<property name="publisherDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PUBLISHERDEFINITION`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="testAuditing.DocumentRootAuditing_mixed" lazy="false" table="`TESTAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">testAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -500,6 +506,21 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="abstractBookDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ABSTRACTBOOKDEFINITION`"/>
+		</property>
+		<property name="adultBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ADULTBOOKS`"/>
+		</property>
+		<property name="booksinlib" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_BOOKSINLIB`"/>
+		</property>
+		<property name="childrenBooks" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_CHILDRENBOOKS`"/>
+		</property>
+		<property name="publisherDefinition" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PUBLISHERDEFINITION`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_e_o_hibernate.hbm.xml
index 807fba613..b7df08e38 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_e_o_hibernate.hbm.xml
@@ -227,7 +227,7 @@
 			<column not-null="false" unique="false" name="`COMMENT`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="mindmapAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.example.org/mindmapAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
@@ -246,7 +246,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="MINDMAPAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -266,16 +266,13 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="mindmapAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="map" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MAP`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="mindmapAuditing.DocumentRootAuditing_mixed" lazy="false" table="`MINDMAPAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">mindmapAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -283,6 +280,9 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="map" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_MAP`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml
index 69d0ece85..91db4af56 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/MindMapAction_hsqldb_h_o_hibernate.hbm.xml
@@ -248,16 +248,13 @@
 			<column not-null="false" unique="false" name="`COMMENT`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" discriminator-value="DocumentRootAuditing" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="mindmapAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.example.org/mindmapAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
 			<generator class="native"/>
 		</id>
-		<discriminator type="string">
-			<column name="`DTYPE`" index="DOCUMENTROOTAUDITINGDTYPE" length="255" not-null="true"/>
-		</discriminator>
 		<version name="teneo_version" type="long">
 			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
 		</version>
@@ -270,7 +267,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="MINDMAPAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -290,16 +287,13 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="mindmapAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="map" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MAP`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="mindmapAuditing.DocumentRootAuditing_mixed" lazy="false" table="`MINDMAPAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">mindmapAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -307,6 +301,9 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="map" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_MAP`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_e_o_hibernate.hbm.xml
index 3a6ccda7c..a5cd4adbc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_e_o_hibernate.hbm.xml
@@ -282,7 +282,7 @@
 			<column not-null="false" unique="false" name="`TITLE`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="playAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/playAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
@@ -301,7 +301,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PLAYAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -321,16 +321,58 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="playAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="act" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ACT`"/>
+		</property>
+		<property name="fm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FM`"/>
+		</property>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`GROUPDESCRIPTION`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LINE`"/>
+		</property>
+		<property name="p" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`P`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PERSONA`"/>
+		</property>
+		<property name="personae" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PERSONAE`"/>
+		</property>
+		<property name="personaGroup" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PERSONAGROUP`"/>
+		</property>
+		<property name="play" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PLAY`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PLAYSUBTITLE`"/>
+		</property>
+		<property name="scene" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SCENE`"/>
+		</property>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SCENEDESCRIPTION`"/>
+		</property>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPEAKER`"/>
+		</property>
+		<property name="speech" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPEECH`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`STAGEDIRECTIONS`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TITLE`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="playAuditing.DocumentRootAuditing_mixed" lazy="false" table="`PLAYAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">playAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -338,6 +380,54 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="act" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ACT`"/>
+		</property>
+		<property name="fm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_FM`"/>
+		</property>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_GROUPDESCRIPTION`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_LINE`"/>
+		</property>
+		<property name="p" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_P`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PERSONA`"/>
+		</property>
+		<property name="personae" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PERSONAE`"/>
+		</property>
+		<property name="personaGroup" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PERSONAGROUP`"/>
+		</property>
+		<property name="play" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PLAY`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PLAYSUBTITLE`"/>
+		</property>
+		<property name="scene" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SCENE`"/>
+		</property>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SCENEDESCRIPTION`"/>
+		</property>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SPEAKER`"/>
+		</property>
+		<property name="speech" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SPEECH`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_STAGEDIRECTIONS`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_TITLE`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_h_o_hibernate.hbm.xml
index 57ad52713..dedc681e4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PlayAction_hsqldb_h_o_hibernate.hbm.xml
@@ -309,16 +309,13 @@
 			<column not-null="false" unique="false" name="`TITLE`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" discriminator-value="DocumentRootAuditing" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="playAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/playAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
 			<generator class="native"/>
 		</id>
-		<discriminator type="string">
-			<column name="`DTYPE`" index="DOCUMENTROOTAUDITINGDTYPE" length="255" not-null="true"/>
-		</discriminator>
 		<version name="teneo_version" type="long">
 			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
 		</version>
@@ -331,7 +328,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PLAYAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -351,16 +348,58 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="playAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="act" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ACT`"/>
+		</property>
+		<property name="fm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FM`"/>
+		</property>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`GROUPDESCRIPTION`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LINE`"/>
+		</property>
+		<property name="p" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`P`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PERSONA`"/>
+		</property>
+		<property name="personae" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PERSONAE`"/>
+		</property>
+		<property name="personaGroup" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PERSONAGROUP`"/>
+		</property>
+		<property name="play" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PLAY`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`PLAYSUBTITLE`"/>
+		</property>
+		<property name="scene" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SCENE`"/>
+		</property>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SCENEDESCRIPTION`"/>
+		</property>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPEAKER`"/>
+		</property>
+		<property name="speech" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`SPEECH`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`STAGEDIRECTIONS`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TITLE`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="playAuditing.DocumentRootAuditing_mixed" lazy="false" table="`PLAYAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">playAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -368,6 +407,54 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="act" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ACT`"/>
+		</property>
+		<property name="fm" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_FM`"/>
+		</property>
+		<property name="groupDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_GROUPDESCRIPTION`"/>
+		</property>
+		<property name="line" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_LINE`"/>
+		</property>
+		<property name="p" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_P`"/>
+		</property>
+		<property name="persona" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PERSONA`"/>
+		</property>
+		<property name="personae" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PERSONAE`"/>
+		</property>
+		<property name="personaGroup" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PERSONAGROUP`"/>
+		</property>
+		<property name="play" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PLAY`"/>
+		</property>
+		<property name="playSubTitle" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_PLAYSUBTITLE`"/>
+		</property>
+		<property name="scene" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SCENE`"/>
+		</property>
+		<property name="sceneDescription" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SCENEDESCRIPTION`"/>
+		</property>
+		<property name="speaker" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SPEAKER`"/>
+		</property>
+		<property name="speech" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_SPEECH`"/>
+		</property>
+		<property name="stageDirections" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_STAGEDIRECTIONS`"/>
+		</property>
+		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_TITLE`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_e_o_hibernate.hbm.xml
index 6ad3f2d05..7feb32ab8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_e_o_hibernate.hbm.xml
@@ -107,7 +107,7 @@
 			<column not-null="false" unique="false" name="`COMMENT`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="schemaprimerpoAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpoAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
@@ -126,7 +126,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SCHEMAPRIMERPOAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -146,16 +146,16 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="schemaprimerpoAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`COMMENT`"/>
+		</property>
+		<property name="order" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ORDER`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="schemaprimerpoAuditing.DocumentRootAuditing_mixed" lazy="false" table="`SCHEMAPRIMERPOAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">schemaprimerpoAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -163,6 +163,12 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_COMMENT`"/>
+		</property>
+		<property name="order" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ORDER`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml
index f1c8faedb..5f1e9687e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/PrimerPOAction_hsqldb_h_o_hibernate.hbm.xml
@@ -119,16 +119,13 @@
 			<column not-null="false" unique="false" name="`COMMENT`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" discriminator-value="DocumentRootAuditing" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="schemaprimerpoAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/schemaprimerpoAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
 			<generator class="native"/>
 		</id>
-		<discriminator type="string">
-			<column name="`DTYPE`" index="DOCUMENTROOTAUDITINGDTYPE" length="255" not-null="true"/>
-		</discriminator>
 		<version name="teneo_version" type="long">
 			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
 		</version>
@@ -141,7 +138,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SCHEMAPRIMERPOAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -161,16 +158,16 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="schemaprimerpoAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`COMMENT`"/>
+		</property>
+		<property name="order" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`ORDER`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="schemaprimerpoAuditing.DocumentRootAuditing_mixed" lazy="false" table="`SCHEMAPRIMERPOAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">schemaprimerpoAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -178,6 +175,12 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_COMMENT`"/>
+		</property>
+		<property name="order" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_ORDER`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_e_o_hibernate.hbm.xml
index b624d9ccd..c941ba178 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_e_o_hibernate.hbm.xml
@@ -346,7 +346,7 @@
 			<column not-null="false" unique="false" name="`BOOKS`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="sunBooksAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_booksAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
@@ -365,7 +365,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SUNBOOKSAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -385,16 +385,13 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="sunBooksAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="collection" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`COLLECTION`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="sunBooksAuditing.DocumentRootAuditing_mixed" lazy="false" table="`SUNBOOKSAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">sunBooksAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -402,6 +399,9 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="collection" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_COLLECTION`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_h_o_hibernate.hbm.xml
index e46f602fa..2c30e2e1d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/SunBooksAction_hsqldb_h_o_hibernate.hbm.xml
@@ -376,16 +376,13 @@
 			<column not-null="false" unique="false" name="`BOOKS`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentRootAuditing" abstract="false" lazy="false" discriminator-value="DocumentRootAuditing" table="`DOCUMENTROOTAUDITING`">
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="sunBooksAuditing.DocumentRootAuditing" abstract="false" lazy="false">
 		<meta attribute="eclassName" inherit="false">DocumentRootAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/sun_booksAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
 			<generator class="native"/>
 		</id>
-		<discriminator type="string">
-			<column name="`DTYPE`" index="DOCUMENTROOTAUDITINGDTYPE" length="255" not-null="true"/>
-		</discriminator>
 		<version name="teneo_version" type="long">
 			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
 		</version>
@@ -398,7 +395,7 @@
 		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_END`"/>
 		</property>
-		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SUNBOOKSAUDITING_DOCUMENTROOTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
 		</many-to-one>
 		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -418,16 +415,13 @@
 		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
 			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
 		</property>
-		<list name="mixed" table="`DOCUMENTROOTAUDITING_MIXED`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`DOCUMENTROOTAUDITING_MIXED_TENEO_AUDIT_ID`" unique="false"/>
-			</key>
-			<list-index column="`DOCUMENTROOTAUDITING_MIXED_IDX`"/>
-			<one-to-many entity-name="DocumentRootAuditing_mixed"/>
-		</list>
+		<many-to-one name="mixed" entity-name="sunBooksAuditing.DocumentRootAuditing_mixed" cascade="all" not-null="false"/>
+		<property name="collection" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`COLLECTION`"/>
+		</property>
 	</class>
-	<class entity-name="DocumentRootAuditing_mixed" lazy="false" table="`DOCUMENTROOTAUDITING_MIXED`">
-		<meta attribute="featureMap" inherit="false">DocumentRootAuditing</meta>
+	<class entity-name="sunBooksAuditing.DocumentRootAuditing_mixed" lazy="false" table="`SUNBOOKSAUDITING_DOCUMENTROOTAUDITING_MIXED`">
+		<meta attribute="featureMap" inherit="false">sunBooksAuditing.DocumentRootAuditing</meta>
 		<id type="long">
 			<generator class="native"/>
 		</id>
@@ -435,6 +429,9 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
+		<property name="collection" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`MIXED_COLLECTION`"/>
+		</property>
 		<property name="fme_mixed_text" type="java.lang.String"/>
 		<property name="fme_mixed_cdata" type="java.lang.String"/>
 		<property name="fme_mixed_comment" type="java.lang.String"/>
-- 
cgit v1.2.3