From 1435b7c6e37b987c644366de5637519c8ed10bb0 Mon Sep 17 00:00:00 2001
From: Martin Taal
Date: Tue, 12 Nov 2013 11:42:58 +0100
Subject: Regenerated all hbm files

---
 ...ationOverrideAction_mysql_a_o_hibernate.hbm.xml |  69 ----
 ...ationOverrideAction_mysql_e_o_hibernate.hbm.xml |  60 ----
 ...ationOverrideAction_mysql_s_o_hibernate.hbm.xml |  60 ----
 ...ionOverrideAction_mysql_xjoin_hibernate.hbm.xml |  60 ----
 ...nOverrideAction_mysql_xsingle_hibernate.hbm.xml |  69 ----
 ...buteOverridesAction_mysql_a_o_hibernate.hbm.xml |  38 ---
 ...buteOverridesAction_mysql_e_o_hibernate.hbm.xml |  35 --
 ...buteOverridesAction_mysql_s_o_hibernate.hbm.xml |  35 --
 .../BasicAction_mysql_a_o_hibernate.hbm.xml        |  22 --
 .../BasicAction_mysql_e_o_hibernate.hbm.xml        |  19 --
 .../BasicAction_mysql_s_o_hibernate.hbm.xml        |  19 --
 .../BookAction_mysql_a_o_hibernate.hbm.xml         |  31 --
 .../BookAction_mysql_e_o_hibernate.hbm.xml         |  28 --
 .../BookAction_mysql_s_o_hibernate.hbm.xml         |  28 --
 ...CascadeNotallAction_mysql_a_o_hibernate.hbm.xml |  95 ------
 ...CascadeNotallAction_mysql_e_o_hibernate.hbm.xml |  86 -----
 ...CascadeNotallAction_mysql_s_o_hibernate.hbm.xml |  86 -----
 ...scadeNotallAction_mysql_xjoin_hibernate.hbm.xml |  86 -----
 ...adeNotallAction_mysql_xsingle_hibernate.hbm.xml |  95 ------
 .../CompositeIdAction_mysql_a_o_hibernate.hbm.xml  |  39 ---
 .../CompositeIdAction_mysql_e_o_hibernate.hbm.xml  |  44 ---
 .../CompositeIdAction_mysql_s_o_hibernate.hbm.xml  |  44 ---
 .../ConnectionsAction_mysql_a_o_hibernate.hbm.xml  | 360 ---------------------
 .../ConnectionsAction_mysql_e_o_hibernate.hbm.xml  | 344 --------------------
 .../ConnectionsAction_mysql_s_o_hibernate.hbm.xml  | 344 --------------------
 .../DuplicatesAction_mysql_a_o_hibernate.hbm.xml   |  46 ---
 .../DuplicatesAction_mysql_e_o_hibernate.hbm.xml   |  40 ---
 .../DuplicatesAction_mysql_s_o_hibernate.hbm.xml   |  40 ---
 .../EDataTypeAction_mysql_a_o_hibernate.hbm.xml    |  31 --
 .../EDataTypeAction_mysql_e_o_hibernate.hbm.xml    |  28 --
 .../EDataTypeAction_mysql_s_o_hibernate.hbm.xml    |  28 --
 .../EDataTypeAction_mysql_xjoin_hibernate.hbm.xml  |  28 --
 ...EDataTypeAction_mysql_xsingle_hibernate.hbm.xml |  31 --
 .../EmbeddedAction_mysql_a_o_hibernate.hbm.xml     |  89 -----
 .../EmbeddedAction_mysql_e_o_hibernate.hbm.xml     |  86 -----
 .../EmbeddedAction_mysql_s_o_hibernate.hbm.xml     |  91 ------
 .../EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml   |  26 --
 .../EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml   |  23 --
 .../EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml   |  23 --
 .../EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml |  23 --
 ...mbeddedIdAction_mysql_xsingle_hibernate.hbm.xml |  26 --
 .../EntityAction_mysql_a_o_hibernate.hbm.xml       |  39 ---
 .../EntityAction_mysql_e_o_hibernate.hbm.xml       |  33 --
 .../EntityAction_mysql_s_o_hibernate.hbm.xml       |  33 --
 .../ExternalAction_mysql_a_o_hibernate.hbm.xml     |  41 ---
 .../ExternalAction_mysql_e_o_hibernate.hbm.xml     |  38 ---
 .../ExternalAction_mysql_s_o_hibernate.hbm.xml     |  38 ---
 .../ExtraLazyAction_mysql_a_o_hibernate.hbm.xml    |  46 ---
 .../ExtraLazyAction_mysql_e_o_hibernate.hbm.xml    |  40 ---
 .../ExtraLazyAction_mysql_s_o_hibernate.hbm.xml    |  40 ---
 .../ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml  |  61 ----
 .../ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml  |  55 ----
 .../ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml  |  55 ----
 .../HbMapKeysAction_mysql_a_o_hibernate.hbm.xml    |  77 -----
 .../HbMapKeysAction_mysql_e_o_hibernate.hbm.xml    |  68 ----
 .../HbMapKeysAction_mysql_s_o_hibernate.hbm.xml    |  68 ----
 .../IdAction_mysql_a_o_hibernate.hbm.xml           | 103 ------
 .../IdAction_mysql_e_o_hibernate.hbm.xml           |  85 -----
 .../IdAction_mysql_s_o_hibernate.hbm.xml           |  85 -----
 .../IdBagAction_mysql_a_o_hibernate.hbm.xml        |  31 --
 .../IdBagAction_mysql_e_o_hibernate.hbm.xml        |  28 --
 .../IdBagAction_mysql_s_o_hibernate.hbm.xml        |  51 ---
 .../IdBagAction_mysql_xjoin_hibernate.hbm.xml      |  28 --
 .../IdBagAction_mysql_xsingle_hibernate.hbm.xml    |  31 --
 ...nceAnnotationAction_mysql_a_o_hibernate.hbm.xml | 186 -----------
 ...nceAnnotationAction_mysql_e_o_hibernate.hbm.xml | 177 ----------
 ...nceAnnotationAction_mysql_s_o_hibernate.hbm.xml | 177 ----------
 ...eAnnotationAction_mysql_xjoin_hibernate.hbm.xml | 188 -----------
 ...nnotationAction_mysql_xsingle_hibernate.hbm.xml | 197 -----------
 ...TablePerClassAction_mysql_a_o_hibernate.hbm.xml | 186 -----------
 ...TablePerClassAction_mysql_e_o_hibernate.hbm.xml | 177 ----------
 ...TablePerClassAction_mysql_s_o_hibernate.hbm.xml | 177 ----------
 ...blePerClassAction_mysql_xjoin_hibernate.hbm.xml | 181 -----------
 ...ePerClassAction_mysql_xsingle_hibernate.hbm.xml | 190 -----------
 ...DiscriminatorAction_mysql_a_o_hibernate.hbm.xml |  53 ---
 ...DiscriminatorAction_mysql_e_o_hibernate.hbm.xml |  53 ---
 ...DiscriminatorAction_mysql_s_o_hibernate.hbm.xml |  53 ---
 .../LazyLibraryAction_mysql_a_o_hibernate.hbm.xml  |  95 ------
 .../LazyLibraryAction_mysql_e_o_hibernate.hbm.xml  |  86 -----
 .../LazyLibraryAction_mysql_s_o_hibernate.hbm.xml  |  86 -----
 .../LobAction_mysql_a_o_hibernate.hbm.xml          |  27 --
 .../LobAction_mysql_e_o_hibernate.hbm.xml          |  24 --
 .../LobAction_mysql_s_o_hibernate.hbm.xml          |  24 --
 .../LobAction_mysql_xjoin_hibernate.hbm.xml        |  28 --
 .../LobAction_mysql_xsingle_hibernate.hbm.xml      |  31 --
 .../ManyToManyAction_mysql_a_o_hibernate.hbm.xml   |  81 -----
 .../ManyToManyAction_mysql_e_o_hibernate.hbm.xml   |  72 -----
 .../ManyToManyAction_mysql_s_o_hibernate.hbm.xml   |  72 -----
 .../MapKeyAction_mysql_a_o_hibernate.hbm.xml       |  46 ---
 .../MapKeyAction_mysql_e_o_hibernate.hbm.xml       |  40 ---
 .../MapKeyAction_mysql_s_o_hibernate.hbm.xml       |  40 ---
 ...pedSuperClassAction_mysql_a_o_hibernate.hbm.xml |  50 ---
 ...pedSuperClassAction_mysql_e_o_hibernate.hbm.xml |  44 ---
 ...pedSuperClassAction_mysql_s_o_hibernate.hbm.xml |  44 ---
 .../NaturalIdAction_mysql_a_o_hibernate.hbm.xml    |  58 ----
 .../NaturalIdAction_mysql_e_o_hibernate.hbm.xml    |  52 ---
 .../NaturalIdAction_mysql_s_o_hibernate.hbm.xml    |  52 ---
 .../OnetoonePKAction_mysql_a_o_hibernate.hbm.xml   |  36 ---
 .../OnetoonePKAction_mysql_e_o_hibernate.hbm.xml   |  30 --
 .../OnetoonePKAction_mysql_s_o_hibernate.hbm.xml   |  30 --
 ...rideSecondaryAction_mysql_a_o_hibernate.hbm.xml |  84 -----
 ...rideSecondaryAction_mysql_e_o_hibernate.hbm.xml |  81 -----
 ...rideSecondaryAction_mysql_s_o_hibernate.hbm.xml |  81 -----
 .../PKeyJoinAction_mysql_a_o_hibernate.hbm.xml     |  35 --
 .../PKeyJoinAction_mysql_e_o_hibernate.hbm.xml     |  29 --
 .../PKeyJoinAction_mysql_s_o_hibernate.hbm.xml     |  29 --
 ...ableHibernateAction_mysql_a_o_hibernate.hbm.xml |  37 ---
 ...ableHibernateAction_mysql_e_o_hibernate.hbm.xml |  34 --
 ...ableHibernateAction_mysql_s_o_hibernate.hbm.xml |  34 --
 ...leHibernateAction_mysql_xjoin_hibernate.hbm.xml |  34 --
 ...HibernateAction_mysql_xsingle_hibernate.hbm.xml |  37 ---
 .../SetAction_mysql_a_o_hibernate.hbm.xml          |  77 -----
 .../SetAction_mysql_e_o_hibernate.hbm.xml          |  68 ----
 .../SetAction_mysql_s_o_hibernate.hbm.xml          |  68 ----
 .../SetNMAction_mysql_a_o_hibernate.hbm.xml        |  55 ----
 .../SetNMAction_mysql_e_o_hibernate.hbm.xml        |  49 ---
 .../SetNMAction_mysql_s_o_hibernate.hbm.xml        |  49 ---
 .../SetResourceAction_mysql_a_o_hibernate.hbm.xml  |  77 -----
 .../SetResourceAction_mysql_e_o_hibernate.hbm.xml  |  68 ----
 .../SetResourceAction_mysql_s_o_hibernate.hbm.xml  |  68 ----
 .../ToOneAction_mysql_a_o_hibernate.hbm.xml        |  76 -----
 .../ToOneAction_mysql_e_o_hibernate.hbm.xml        |  64 ----
 .../ToOneAction_mysql_s_o_hibernate.hbm.xml        |  64 ----
 .../ToOneAction_mysql_xjoin_hibernate.hbm.xml      |  66 ----
 .../ToOneAction_mysql_xsingle_hibernate.hbm.xml    |  78 -----
 .../TransientAction_mysql_a_o_hibernate.hbm.xml    |  18 --
 .../TransientAction_mysql_e_o_hibernate.hbm.xml    |  15 -
 .../TransientAction_mysql_s_o_hibernate.hbm.xml    |  15 -
 .../TransientAction_mysql_xjoin_hibernate.hbm.xml  |  15 -
 ...TransientAction_mysql_xsingle_hibernate.hbm.xml |  18 --
 ...ueConstraintsAction_mysql_a_o_hibernate.hbm.xml |  45 ---
 ...ueConstraintsAction_mysql_e_o_hibernate.hbm.xml |  39 ---
 ...ueConstraintsAction_mysql_s_o_hibernate.hbm.xml |  39 ---
 .../VariousAction_mysql_a_o_hibernate.hbm.xml      |  51 ---
 .../VariousAction_mysql_e_o_hibernate.hbm.xml      |  51 ---
 .../VariousAction_mysql_s_o_hibernate.hbm.xml      |  51 ---
 136 files changed, 8971 deletions(-)
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xjoin_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xsingle_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_a_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_e_o_hibernate.hbm.xml
 delete mode 100755 tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_s_o_hibernate.hbm.xml

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

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index c0fef8824..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postalcode`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`employee_address_id`"/>
-		</many-to-one>
-		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`department`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" discriminator-value="Student" table="`student`">
-		<meta attribute="eclassName">Student</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="studentdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`faculty`"/>
-		</property>
-	</class>
-</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_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index aaf933472..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postalcode`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`employee_address_id`"/>
-		</many-to-one>
-		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`department`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" table="`student`">
-		<meta attribute="eclassName">Student</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`faculty`"/>
-		</property>
-	</class>
-</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_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index aaf933472..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postalcode`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`employee_address_id`"/>
-		</many-to-one>
-		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`department`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" table="`student`">
-		<meta attribute="eclassName">Student</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`faculty`"/>
-		</property>
-	</class>
-</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_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index aaf933472..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postalcode`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`employee_address_id`"/>
-		</many-to-one>
-		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`department`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" table="`student`">
-		<meta attribute="eclassName">Student</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`faculty`"/>
-		</property>
-	</class>
-</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_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index c0fef8824..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id type="long" name="myid" column="myid" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="postalCode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postalcode`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`employee_address_id`"/>
-		</many-to-one>
-		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`department`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl.StudentImpl" entity-name="Student" abstract="false" lazy="false" discriminator-value="Student" table="`student`">
-		<meta attribute="eclassName">Student</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="studentdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`faculty`"/>
-		</property>
-	</class>
-</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/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 1741f2cc0..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http:///org/eclipse/emf/teneo/samples/emf/annotations/attributeoverrides.ecore</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<component name="bornIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
-			<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="`bornnamecolumn`"/>
-			</property>
-			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`bornin_country`"/>
-			</property>
-		</component>
-		<component name="livesIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
-			<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="`namecolumn`"/>
-			</property>
-			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`countrycolumn`"/>
-			</property>
-		</component>
-	</class>
-</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/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 69184ed37..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http:///org/eclipse/emf/teneo/samples/emf/annotations/attributeoverrides.ecore</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<component name="bornIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
-			<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="`bornnamecolumn`"/>
-			</property>
-			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`bornin_country`"/>
-			</property>
-		</component>
-		<component name="livesIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
-			<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="`namecolumn`"/>
-			</property>
-			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`countrycolumn`"/>
-			</property>
-		</component>
-	</class>
-</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/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 69184ed37..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AttributeOverridesAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http:///org/eclipse/emf/teneo/samples/emf/annotations/attributeoverrides.ecore</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<component name="bornIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
-			<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="`bornnamecolumn`"/>
-			</property>
-			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`bornin_country`"/>
-			</property>
-		</component>
-		<component name="livesIn" class="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl.CityImpl">
-			<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="`namecolumn`"/>
-			</property>
-			<property name="country" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`countrycolumn`"/>
-			</property>
-		</component>
-	</class>
-</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/BasicAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 37dc6c7dd..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`">
-		<meta attribute="eclassName">Basic</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/basic</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="basicdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="myVersion" type="long">
-			<column not-null="true" unique="false" name="`myversion`"/>
-		</version>
-		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
-		</property>
-	</class>
-</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/BasicAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index e700fa97b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" entity-name="Basic" abstract="false" lazy="false" table="`basic`">
-		<meta attribute="eclassName">Basic</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/basic</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="myVersion" type="long">
-			<column not-null="true" unique="false" name="`myversion`"/>
-		</version>
-		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
-		</property>
-	</class>
-</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/BasicAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index e700fa97b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BasicAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" entity-name="Basic" abstract="false" lazy="false" table="`basic`">
-		<meta attribute="eclassName">Basic</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/basic</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="myVersion" type="long">
-			<column not-null="true" unique="false" name="`myversion`"/>
-		</version>
-		<property name="myOptionalBasic" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`myoptionalbasic`"/>
-		</property>
-	</class>
-</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/BookAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 4a28bcc5d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="mybooktabledtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/BookAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 2871c98ac..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/BookAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 2871c98ac..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index b33374da1..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index dd626ea46..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index dd626ea46..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index dd626ea46..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index b33374da1..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CascadeNotallAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index f75b850a1..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" discriminator-value="Parent">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="parent_children">
-				<column name="`myparentfirstname`" not-null="false" unique="false"/>
-				<column name="`myparentlastname`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_children_idx`"/>
-			<one-to-many entity-name="Child"/>
-		</list>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" discriminator-value="Child">
-		<meta attribute="eclassName">Child</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-	</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_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index f69ba6902..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<key>
-			<column name="`person_firstname`"/>
-			<column name="`person_lastname`"/>
-		</key>
-		<list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="parent_children">
-				<column name="`myparentfirstname`" not-null="false" unique="false"/>
-				<column name="`myparentlastname`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_children_idx`"/>
-			<one-to-many entity-name="Child"/>
-		</list>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
-		<meta attribute="eclassName">Child</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<key>
-			<column name="`person_firstname`"/>
-			<column name="`person_lastname`"/>
-		</key>
-	</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/CompositeIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index f69ba6902..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<key>
-			<column name="`person_firstname`"/>
-			<column name="`person_lastname`"/>
-		</key>
-		<list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="parent_children">
-				<column name="`myparentfirstname`" not-null="false" unique="false"/>
-				<column name="`myparentlastname`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_children_idx`"/>
-			<one-to-many entity-name="Child"/>
-		</list>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
-		<meta attribute="eclassName">Child</meta>
-		<meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta>
-		<key>
-			<column name="`person_firstname`"/>
-			<column name="`person_lastname`"/>
-		</key>
-	</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/ConnectionsAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index a608070bc..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="com.ibm.example.connection.impl.M2mbjoinImpl" entity-name="M2mbjoin" abstract="false" lazy="false" discriminator-value="M2mbjoin" table="`m2mbjoin`">
-		<meta attribute="eclassName">M2mbjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<bag name="parent" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`m2mbjoinjointable`">
-			<key update="true">
-				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Parent" unique="false" foreign-key="m2mbjoin_parent">
-				<column name="`parent_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-	<class name="com.ibm.example.connection.impl.M2osjoinImpl" entity-name="M2osjoin" abstract="false" lazy="false" discriminator-value="M2osjoin" table="`m2osjoin`">
-		<meta attribute="eclassName">M2osjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.M2osparentImpl" entity-name="M2osparent" abstract="false" lazy="false" discriminator-value="M2osparent" table="`m2osparent`">
-		<meta attribute="eclassName">M2osparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mbchildImpl" entity-name="O2mbchild" abstract="false" lazy="false" discriminator-value="O2mbchild" table="`o2mbchild`">
-		<meta attribute="eclassName">O2mbchild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbchild_parent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`parent`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mbjoinImpl" entity-name="O2mbjoin" abstract="false" lazy="false" discriminator-value="O2mbjoin" table="`o2mbjoin`">
-		<meta attribute="eclassName">O2mbjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbjoin_parent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`parent_parent_id`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mschildImpl" entity-name="O2mschild" abstract="false" lazy="false" discriminator-value="O2mschild" table="`o2mschild`">
-		<meta attribute="eclassName">O2mschild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mschild_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mschildInvisImpl" entity-name="O2mschildInvis" abstract="false" lazy="false" discriminator-value="O2mschildInvis" table="`o2mschildinvis`">
-		<meta attribute="eclassName">O2mschildInvis</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2msjoinImpl" entity-name="O2msjoin" abstract="false" lazy="false" discriminator-value="O2msjoin" table="`o2msjoin`">
-		<meta attribute="eclassName">O2msjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2obchildImpl" entity-name="O2obchild" abstract="false" lazy="false" discriminator-value="O2obchild" table="`o2obchild`">
-		<meta attribute="eclassName">O2obchild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obchild_parent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`parent`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2objoinImpl" entity-name="O2objoin" abstract="false" lazy="false" discriminator-value="O2objoin" table="`o2objoin`">
-		<meta attribute="eclassName">O2objoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2objoin_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2obparentImpl" entity-name="O2obparent" abstract="false" lazy="false" discriminator-value="O2obparent" table="`o2obparent`">
-		<meta attribute="eclassName">O2obparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obparent_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2oschildImpl" entity-name="O2oschild" abstract="false" lazy="false" discriminator-value="O2oschild" table="`o2oschild`">
-		<meta attribute="eclassName">O2oschild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="false" name="`idchild`"/>
-			<generator class="foreign">
-				<param name="property">idChild</param>
-			</generator>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2oschildInvisImpl" entity-name="O2oschildInvis" abstract="false" lazy="false" discriminator-value="O2oschildInvis" table="`o2oschildinvis`">
-		<meta attribute="eclassName">O2oschildInvis</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2osjoinImpl" entity-name="O2osjoin" abstract="false" lazy="false" discriminator-value="O2osjoin" table="`o2osjoin`">
-		<meta attribute="eclassName">O2osjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2osparentImpl" entity-name="O2osparent" abstract="false" lazy="false" discriminator-value="O2osparent" table="`o2osparent`">
-		<meta attribute="eclassName">O2osparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" discriminator-value="Parent" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="o2osparent" entity-name="O2osparent" cascade="all" foreign-key="parent_o2osparent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`o2osp`"/>
-		</many-to-one>
-		<one-to-one name="o2oschild" entity-name="O2oschild" foreign-key="parent_o2oschild" cascade="all" lazy="false" constrained="true"/>
-		<many-to-one name="o2osjoin" entity-name="O2osjoin" cascade="all" foreign-key="parent_o2osjoin" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`o2osjoin_o2osjoin_idchild`"/>
-		</many-to-one>
-		<many-to-one name="o2oschildInvis" entity-name="O2oschildInvis" cascade="all" foreign-key="parent_o2oschildinvis" lazy="false" insert="true" update="true"/>
-		<component name="o2oschildEmbed" class="com.ibm.example.connection.impl.O2oschildEmbedImpl">
-			<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-				<column not-null="false" unique="true" name="`phone`" length="25"/>
-			</property>
-		</component>
-		<many-to-one name="o2obparent" entity-name="O2obparent" cascade="all" foreign-key="parent_o2obparent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`o2obp`"/>
-		</many-to-one>
-		<many-to-one name="o2obchild" entity-name="O2obchild" cascade="all" foreign-key="parent_o2obchild" lazy="false" insert="true" update="true"/>
-		<many-to-one name="o2objoin" entity-name="O2objoin" cascade="all" foreign-key="parent_o2objoin" lazy="false" insert="true" update="true"/>
-		<list name="o2mschild" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mschild">
-				<column name="`parent_o2mschild_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mschild_idx`"/>
-			<one-to-many entity-name="O2mschild"/>
-		</list>
-		<list name="o2msjoin" table="`o2msjoinjointable`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`id`" not-null="false" unique="true"/>
-			</key>
-			<list-index column="`parent_o2msjoin_idx`"/>
-			<many-to-many entity-name="O2msjoin" unique="true" foreign-key="parent_o2msjoin">
-				<column name="`idchild`" not-null="false" unique="false"/>
-			</many-to-many>
-		</list>
-		<list name="o2mschildInvis" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mschildinvis">
-				<column name="`parent_o2mschildinvis_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mschildinvis_idx`"/>
-			<one-to-many entity-name="O2mschildInvis"/>
-		</list>
-		<component name="o2mschildEmbed1" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city1`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state1`"/>
-			</property>
-		</component>
-		<component name="o2mschildEmbed2" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city2`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state2`"/>
-			</property>
-		</component>
-		<component name="o2mschildEmbed3" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city3`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state3`"/>
-			</property>
-		</component>
-		<list name="o2mbchild" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mbchild">
-				<column name="`parent_o2mbchild_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mbchild_idx`"/>
-			<one-to-many entity-name="O2mbchild"/>
-		</list>
-		<list name="o2mbjoin" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mbjoin">
-				<column name="`parent_o2mbjoin_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mbjoin_idx`"/>
-			<one-to-many entity-name="O2mbjoin"/>
-		</list>
-		<many-to-one name="m2osparent" entity-name="M2osparent" cascade="all" foreign-key="parent_m2osparent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`m2osp`"/>
-		</many-to-one>
-		<many-to-one name="m2osjoin" entity-name="M2osjoin" cascade="all" foreign-key="parent_m2osjoin" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`m2osjoin_m2osjoin_idchild`"/>
-		</many-to-one>
-		<bag name="m2mbjoin" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m2mbjoinjointable`">
-			<key update="true">
-				<column name="`parent_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="M2mbjoin" unique="false" foreign-key="parent_m2mbjoin">
-				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/ConnectionsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 2b6f3f89d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="com.ibm.example.connection.impl.M2mbjoinImpl" entity-name="M2mbjoin" abstract="false" lazy="false" table="`m2mbjoin`">
-		<meta attribute="eclassName">M2mbjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<bag name="parent" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`m2mbjoinjointable`">
-			<key update="true">
-				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Parent" unique="false" foreign-key="m2mbjoin_parent">
-				<column name="`parent_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-	<class name="com.ibm.example.connection.impl.M2osjoinImpl" entity-name="M2osjoin" abstract="false" lazy="false" table="`m2osjoin`">
-		<meta attribute="eclassName">M2osjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.M2osparentImpl" entity-name="M2osparent" abstract="false" lazy="false" table="`m2osparent`">
-		<meta attribute="eclassName">M2osparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mbchildImpl" entity-name="O2mbchild" abstract="false" lazy="false" table="`o2mbchild`">
-		<meta attribute="eclassName">O2mbchild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbchild_parent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`parent`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mbjoinImpl" entity-name="O2mbjoin" abstract="false" lazy="false" table="`o2mbjoin`">
-		<meta attribute="eclassName">O2mbjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbjoin_parent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`parent_parent_id`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mschildImpl" entity-name="O2mschild" abstract="false" lazy="false" table="`o2mschild`">
-		<meta attribute="eclassName">O2mschild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mschild_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mschildInvisImpl" entity-name="O2mschildInvis" abstract="false" lazy="false" table="`o2mschildinvis`">
-		<meta attribute="eclassName">O2mschildInvis</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2msjoinImpl" entity-name="O2msjoin" abstract="false" lazy="false" table="`o2msjoin`">
-		<meta attribute="eclassName">O2msjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2obchildImpl" entity-name="O2obchild" abstract="false" lazy="false" table="`o2obchild`">
-		<meta attribute="eclassName">O2obchild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obchild_parent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`parent`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2objoinImpl" entity-name="O2objoin" abstract="false" lazy="false" table="`o2objoin`">
-		<meta attribute="eclassName">O2objoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2objoin_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2obparentImpl" entity-name="O2obparent" abstract="false" lazy="false" table="`o2obparent`">
-		<meta attribute="eclassName">O2obparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obparent_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2oschildImpl" entity-name="O2oschild" abstract="false" lazy="false" table="`o2oschild`">
-		<meta attribute="eclassName">O2oschild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="false" name="`idchild`"/>
-			<generator class="foreign">
-				<param name="property">idChild</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2oschildInvisImpl" entity-name="O2oschildInvis" abstract="false" lazy="false" table="`o2oschildinvis`">
-		<meta attribute="eclassName">O2oschildInvis</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2osjoinImpl" entity-name="O2osjoin" abstract="false" lazy="false" table="`o2osjoin`">
-		<meta attribute="eclassName">O2osjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2osparentImpl" entity-name="O2osparent" abstract="false" lazy="false" table="`o2osparent`">
-		<meta attribute="eclassName">O2osparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="o2osparent" entity-name="O2osparent" cascade="all" foreign-key="parent_o2osparent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`o2osp`"/>
-		</many-to-one>
-		<one-to-one name="o2oschild" entity-name="O2oschild" foreign-key="parent_o2oschild" cascade="all" lazy="false" constrained="true"/>
-		<many-to-one name="o2osjoin" entity-name="O2osjoin" cascade="all" foreign-key="parent_o2osjoin" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`o2osjoin_o2osjoin_idchild`"/>
-		</many-to-one>
-		<many-to-one name="o2oschildInvis" entity-name="O2oschildInvis" cascade="all" foreign-key="parent_o2oschildinvis" lazy="false" insert="true" update="true"/>
-		<component name="o2oschildEmbed" class="com.ibm.example.connection.impl.O2oschildEmbedImpl">
-			<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-				<column not-null="false" unique="true" name="`phone`" length="25"/>
-			</property>
-		</component>
-		<many-to-one name="o2obparent" entity-name="O2obparent" cascade="all" foreign-key="parent_o2obparent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`o2obp`"/>
-		</many-to-one>
-		<many-to-one name="o2obchild" entity-name="O2obchild" cascade="all" foreign-key="parent_o2obchild" lazy="false" insert="true" update="true"/>
-		<many-to-one name="o2objoin" entity-name="O2objoin" cascade="all" foreign-key="parent_o2objoin" lazy="false" insert="true" update="true"/>
-		<list name="o2mschild" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mschild">
-				<column name="`parent_o2mschild_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mschild_idx`"/>
-			<one-to-many entity-name="O2mschild"/>
-		</list>
-		<list name="o2msjoin" table="`o2msjoinjointable`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`id`" not-null="false" unique="true"/>
-			</key>
-			<list-index column="`parent_o2msjoin_idx`"/>
-			<many-to-many entity-name="O2msjoin" unique="true" foreign-key="parent_o2msjoin">
-				<column name="`idchild`" not-null="false" unique="false"/>
-			</many-to-many>
-		</list>
-		<list name="o2mschildInvis" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mschildinvis">
-				<column name="`parent_o2mschildinvis_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mschildinvis_idx`"/>
-			<one-to-many entity-name="O2mschildInvis"/>
-		</list>
-		<component name="o2mschildEmbed1" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city1`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state1`"/>
-			</property>
-		</component>
-		<component name="o2mschildEmbed2" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city2`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state2`"/>
-			</property>
-		</component>
-		<component name="o2mschildEmbed3" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city3`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state3`"/>
-			</property>
-		</component>
-		<list name="o2mbchild" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mbchild">
-				<column name="`parent_o2mbchild_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mbchild_idx`"/>
-			<one-to-many entity-name="O2mbchild"/>
-		</list>
-		<list name="o2mbjoin" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mbjoin">
-				<column name="`parent_o2mbjoin_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mbjoin_idx`"/>
-			<one-to-many entity-name="O2mbjoin"/>
-		</list>
-		<many-to-one name="m2osparent" entity-name="M2osparent" cascade="all" foreign-key="parent_m2osparent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`m2osp`"/>
-		</many-to-one>
-		<many-to-one name="m2osjoin" entity-name="M2osjoin" cascade="all" foreign-key="parent_m2osjoin" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`m2osjoin_m2osjoin_idchild`"/>
-		</many-to-one>
-		<bag name="m2mbjoin" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m2mbjoinjointable`">
-			<key update="true">
-				<column name="`parent_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="M2mbjoin" unique="false" foreign-key="parent_m2mbjoin">
-				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/ConnectionsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 2b6f3f89d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ConnectionsAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="com.ibm.example.connection.impl.M2mbjoinImpl" entity-name="M2mbjoin" abstract="false" lazy="false" table="`m2mbjoin`">
-		<meta attribute="eclassName">M2mbjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<bag name="parent" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`m2mbjoinjointable`">
-			<key update="true">
-				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Parent" unique="false" foreign-key="m2mbjoin_parent">
-				<column name="`parent_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-	<class name="com.ibm.example.connection.impl.M2osjoinImpl" entity-name="M2osjoin" abstract="false" lazy="false" table="`m2osjoin`">
-		<meta attribute="eclassName">M2osjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.M2osparentImpl" entity-name="M2osparent" abstract="false" lazy="false" table="`m2osparent`">
-		<meta attribute="eclassName">M2osparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mbchildImpl" entity-name="O2mbchild" abstract="false" lazy="false" table="`o2mbchild`">
-		<meta attribute="eclassName">O2mbchild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbchild_parent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`parent`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mbjoinImpl" entity-name="O2mbjoin" abstract="false" lazy="false" table="`o2mbjoin`">
-		<meta attribute="eclassName">O2mbjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mbjoin_parent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`parent_parent_id`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mschildImpl" entity-name="O2mschild" abstract="false" lazy="false" table="`o2mschild`">
-		<meta attribute="eclassName">O2mschild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2mschild_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2mschildInvisImpl" entity-name="O2mschildInvis" abstract="false" lazy="false" table="`o2mschildinvis`">
-		<meta attribute="eclassName">O2mschildInvis</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2msjoinImpl" entity-name="O2msjoin" abstract="false" lazy="false" table="`o2msjoin`">
-		<meta attribute="eclassName">O2msjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2obchildImpl" entity-name="O2obchild" abstract="false" lazy="false" table="`o2obchild`">
-		<meta attribute="eclassName">O2obchild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obchild_parent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`parent`"/>
-		</many-to-one>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2objoinImpl" entity-name="O2objoin" abstract="false" lazy="false" table="`o2objoin`">
-		<meta attribute="eclassName">O2objoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2objoin_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2obparentImpl" entity-name="O2obparent" abstract="false" lazy="false" table="`o2obparent`">
-		<meta attribute="eclassName">O2obparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="parent" entity-name="Parent" cascade="all" foreign-key="o2obparent_parent" lazy="false" insert="true" update="true"/>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2oschildImpl" entity-name="O2oschild" abstract="false" lazy="false" table="`o2oschild`">
-		<meta attribute="eclassName">O2oschild</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="false" name="`idchild`"/>
-			<generator class="foreign">
-				<param name="property">idChild</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2oschildInvisImpl" entity-name="O2oschildInvis" abstract="false" lazy="false" table="`o2oschildinvis`">
-		<meta attribute="eclassName">O2oschildInvis</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2osjoinImpl" entity-name="O2osjoin" abstract="false" lazy="false" table="`o2osjoin`">
-		<meta attribute="eclassName">O2osjoin</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.O2osparentImpl" entity-name="O2osparent" abstract="false" lazy="false" table="`o2osparent`">
-		<meta attribute="eclassName">O2osparent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="idChild" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`idchild`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-	</class>
-	<class name="com.ibm.example.connection.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http:///com/ibm/example/connection.ecore</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="false" unique="true" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="data" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`data`" length="25"/>
-		</property>
-		<many-to-one name="o2osparent" entity-name="O2osparent" cascade="all" foreign-key="parent_o2osparent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`o2osp`"/>
-		</many-to-one>
-		<one-to-one name="o2oschild" entity-name="O2oschild" foreign-key="parent_o2oschild" cascade="all" lazy="false" constrained="true"/>
-		<many-to-one name="o2osjoin" entity-name="O2osjoin" cascade="all" foreign-key="parent_o2osjoin" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`o2osjoin_o2osjoin_idchild`"/>
-		</many-to-one>
-		<many-to-one name="o2oschildInvis" entity-name="O2oschildInvis" cascade="all" foreign-key="parent_o2oschildinvis" lazy="false" insert="true" update="true"/>
-		<component name="o2oschildEmbed" class="com.ibm.example.connection.impl.O2oschildEmbedImpl">
-			<property name="phone" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-				<column not-null="false" unique="true" name="`phone`" length="25"/>
-			</property>
-		</component>
-		<many-to-one name="o2obparent" entity-name="O2obparent" cascade="all" foreign-key="parent_o2obparent" lazy="false" insert="true" update="true">
-			<column not-null="false" unique="false" name="`o2obp`"/>
-		</many-to-one>
-		<many-to-one name="o2obchild" entity-name="O2obchild" cascade="all" foreign-key="parent_o2obchild" lazy="false" insert="true" update="true"/>
-		<many-to-one name="o2objoin" entity-name="O2objoin" cascade="all" foreign-key="parent_o2objoin" lazy="false" insert="true" update="true"/>
-		<list name="o2mschild" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mschild">
-				<column name="`parent_o2mschild_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mschild_idx`"/>
-			<one-to-many entity-name="O2mschild"/>
-		</list>
-		<list name="o2msjoin" table="`o2msjoinjointable`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`id`" not-null="false" unique="true"/>
-			</key>
-			<list-index column="`parent_o2msjoin_idx`"/>
-			<many-to-many entity-name="O2msjoin" unique="true" foreign-key="parent_o2msjoin">
-				<column name="`idchild`" not-null="false" unique="false"/>
-			</many-to-many>
-		</list>
-		<list name="o2mschildInvis" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mschildinvis">
-				<column name="`parent_o2mschildinvis_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mschildinvis_idx`"/>
-			<one-to-many entity-name="O2mschildInvis"/>
-		</list>
-		<component name="o2mschildEmbed1" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city1`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state1`"/>
-			</property>
-		</component>
-		<component name="o2mschildEmbed2" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city2`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state2`"/>
-			</property>
-		</component>
-		<component name="o2mschildEmbed3" class="com.ibm.example.connection.impl.O2mschildEmbedImpl">
-			<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="`city3`"/>
-			</property>
-			<property name="state" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`state3`"/>
-			</property>
-		</component>
-		<list name="o2mbchild" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mbchild">
-				<column name="`parent_o2mbchild_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mbchild_idx`"/>
-			<one-to-many entity-name="O2mbchild"/>
-		</list>
-		<list name="o2mbjoin" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="parent_o2mbjoin">
-				<column name="`parent_o2mbjoin_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_o2mbjoin_idx`"/>
-			<one-to-many entity-name="O2mbjoin"/>
-		</list>
-		<many-to-one name="m2osparent" entity-name="M2osparent" cascade="all" foreign-key="parent_m2osparent" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`m2osp`"/>
-		</many-to-one>
-		<many-to-one name="m2osjoin" entity-name="M2osjoin" cascade="all" foreign-key="parent_m2osjoin" lazy="false" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`m2osjoin_m2osjoin_idchild`"/>
-		</many-to-one>
-		<bag name="m2mbjoin" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`m2mbjoinjointable`">
-			<key update="true">
-				<column name="`parent_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="M2mbjoin" unique="false" foreign-key="parent_m2mbjoin">
-				<column name="`m2mbjoin_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/DuplicatesAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index d0e9c4fc7..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`">
-		<meta attribute="eclassName">ChildItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="childitemdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="childItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="item_childitem">
-				<column name="`item_childitem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`item_childitem_idx`"/>
-			<one-to-many entity-name="ChildItem"/>
-		</list>
-	</class>
-</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/DuplicatesAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 1a7c4681f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`">
-		<meta attribute="eclassName">ChildItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="childItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="item_childitem">
-				<column name="`item_childitem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`item_childitem_idx`"/>
-			<one-to-many entity-name="ChildItem"/>
-		</list>
-	</class>
-</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/DuplicatesAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 1a7c4681f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/DuplicatesAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`">
-		<meta attribute="eclassName">ChildItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/duplicates</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="childItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="item_childitem">
-				<column name="`item_childitem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`item_childitem_idx`"/>
-			<one-to-many entity-name="ChildItem"/>
-		</list>
-	</class>
-</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/EDataTypeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 251a51ac3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="mybooktabledtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/EDataTypeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 421d8f68b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/EDataTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 421d8f68b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 421d8f68b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 251a51ac3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EDataTypeAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/edatatype_column</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="mybooktabledtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
-			<column not-null="false" unique="true" name="`titel`" length="25"/>
-		</property>
-		<property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
-			<column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
-		</property>
-		<property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`author`"/>
-		</property>
-	</class>
-</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/EmbeddedAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 9ba8dd165..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbedderImpl" entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`">
-		<meta attribute="eclassName">Embedder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="embedderdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<component name="firstEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring3`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
-			</property>
-		</component>
-		<component name="secondEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring1`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`columninteger1`"/>
-			</property>
-		</component>
-		<component name="thirdEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring2`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`columninteger2`"/>
-			</property>
-		</component>
-		<list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`embedder_fourthembedded_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`embedder_fourthembedded_idx`"/>
-			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-					<column not-null="true" unique="false" name="`mystring`"/>
-				</property>
-				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-					<column not-null="false" unique="false" name="`myinteger`"/>
-				</property>
-			</composite-element>
-		</list>
-		<component name="fifthEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
-			</property>
-		</component>
-		<component name="alsoEmbeddable" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AlsoEmbeddableImpl">
-			<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="`alsoembeddable_name`"/>
-			</property>
-		</component>
-		<component name="anotherEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AnotherEmbeddableImpl">
-			<property name="anotherName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`anotherembedded_anothername`"/>
-			</property>
-			<list name="aOneToMany" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-				<key update="true">
-					<column name="`anotherembeddable_aonetomany_e_id`" not-null="true" unique="false"/>
-				</key>
-				<list-index column="`anotherembeddable_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="`anotherembedded_name`"/>
-					</property>
-				</composite-element>
-			</list>
-			<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="`anotherembedded_name`"/>
-			</property>
-		</component>
-	</class>
-</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/EmbeddedAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index b064080ad..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbedderImpl" entity-name="Embedder" abstract="false" lazy="false" table="`embedder`">
-		<meta attribute="eclassName">Embedder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<component name="firstEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring3`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
-			</property>
-		</component>
-		<component name="secondEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring1`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`columninteger1`"/>
-			</property>
-		</component>
-		<component name="thirdEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring2`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`columninteger2`"/>
-			</property>
-		</component>
-		<list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`embedder_fourthembedded_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`embedder_fourthembedded_idx`"/>
-			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-					<column not-null="true" unique="false" name="`mystring`"/>
-				</property>
-				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-					<column not-null="false" unique="false" name="`myinteger`"/>
-				</property>
-			</composite-element>
-		</list>
-		<component name="fifthEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
-			</property>
-		</component>
-		<component name="alsoEmbeddable" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AlsoEmbeddableImpl">
-			<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="`alsoembeddable_name`"/>
-			</property>
-		</component>
-		<component name="anotherEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AnotherEmbeddableImpl">
-			<property name="anotherName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`anotherembedded_anothername`"/>
-			</property>
-			<list name="aOneToMany" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-				<key update="true">
-					<column name="`anotherembeddable_aonetomany_e_id`" not-null="true" unique="false"/>
-				</key>
-				<list-index column="`anotherembeddable_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="`anotherembedded_name`"/>
-					</property>
-				</composite-element>
-			</list>
-			<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="`anotherembedded_name`"/>
-			</property>
-		</component>
-	</class>
-</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/EmbeddedAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index d2e188240..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbedderImpl" entity-name="Embedder" abstract="false" lazy="false" table="`embedder`">
-		<meta attribute="eclassName">Embedder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<component name="firstEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring3`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`firstembedded_myinteger`"/>
-			</property>
-		</component>
-		<component name="secondEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring1`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`columninteger1`"/>
-			</property>
-		</component>
-		<component name="thirdEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="false" unique="false" name="`columnstring2`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`columninteger2`"/>
-			</property>
-		</component>
-		<list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`embedder_fourthembedded_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`embedder_fourthembedded_idx`"/>
-			<composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-				<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-					<column not-null="true" unique="false" name="`mystring`"/>
-				</property>
-				<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-					<column not-null="false" unique="false" name="`myinteger`"/>
-				</property>
-			</composite-element>
-		</list>
-		<component name="fifthEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.EmbeddableImpl">
-			<property name="myString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`fifthembedded_mystring`"/>
-			</property>
-			<property name="myInteger" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-				<column not-null="false" unique="false" name="`fifthembedded_myinteger`"/>
-			</property>
-		</component>
-		<component name="alsoEmbeddable" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AlsoEmbeddableImpl">
-			<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="`alsoembeddable_name`"/>
-			</property>
-		</component>
-		<component name="anotherEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AnotherEmbeddableImpl">
-			<property name="anotherName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`anotherembedded_anothername`"/>
-			</property>
-			<list name="aOneToMany" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-				<key update="true">
-					<column name="`anotherembeddable_aonetomany_e_id`" not-null="true" unique="false"/>
-				</key>
-				<list-index column="`anotherembeddable_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="`anotherembedded_name`"/>
-					</property>
-				</composite-element>
-			</list>
-			<component name="nestedEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.NestedEmbeddableImpl">
-				<property name="nestedName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-					<column not-null="false" unique="false" name="`ne_nestedname`"/>
-				</property>
-			</component>
-			<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="`anotherembedded_name`"/>
-			</property>
-		</component>
-	</class>
-</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/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index e85eb5305..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
-		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-	</class>
-</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/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 22828e5f4..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
-		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-	</class>
-</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/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 22828e5f4..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
-		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-	</class>
-</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/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 22828e5f4..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
-		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-	</class>
-</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/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index e85eb5305..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedIdAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta>
-		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
-			<key-property name="firstName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</key-property>
-			<key-property name="lastName" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</key-property>
-		</composite-id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-	</class>
-</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/EntityAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index b23c91454..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.BookImpl" entity-name="Boek" abstract="false" lazy="false" discriminator-value="Boek" table="`boek`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="boekdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.WriterImpl" entity-name="Schrijver" abstract="false" lazy="false" discriminator-value="Schrijver" table="`schrijver`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="schrijverdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/EntityAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 851c37f30..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.BookImpl" entity-name="Boek" abstract="false" lazy="false" table="`boek`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.WriterImpl" entity-name="Schrijver" abstract="false" lazy="false" table="`schrijver`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/EntityAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 851c37f30..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EntityAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.BookImpl" entity-name="Boek" abstract="false" lazy="false" table="`boek`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.entity.impl.WriterImpl" entity-name="Schrijver" abstract="false" lazy="false" table="`schrijver`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/entity</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/ExternalAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 4f13c8606..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.external.impl.ExternalTestImpl" entity-name="ExternalTest" abstract="false" lazy="false" discriminator-value="ExternalTest" table="`externaltest`">
-		<meta attribute="eclassName">ExternalTest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="externaltestdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="eObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
-			<column not-null="false" unique="false" name="`eobject`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
-				<param name="eclassName">EObject</param>
-				<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
-			</type>
-		</property>
-		<list name="eObjects" table="`externaltest_eobjects`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`externaltest_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`externaltest_eobjects_idx`"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
-					<param name="eclassName">EObject</param>
-					<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
-				</type>
-			</element>
-		</list>
-	</class>
-</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/ExternalAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index e387ac0c6..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.external.impl.ExternalTestImpl" entity-name="ExternalTest" abstract="false" lazy="false" table="`externaltest`">
-		<meta attribute="eclassName">ExternalTest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="eObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
-			<column not-null="false" unique="false" name="`eobject`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
-				<param name="eclassName">EObject</param>
-				<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
-			</type>
-		</property>
-		<list name="eObjects" table="`externaltest_eobjects`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`externaltest_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`externaltest_eobjects_idx`"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
-					<param name="eclassName">EObject</param>
-					<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
-				</type>
-			</element>
-		</list>
-	</class>
-</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/ExternalAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index e387ac0c6..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.external.impl.ExternalTestImpl" entity-name="ExternalTest" abstract="false" lazy="false" table="`externaltest`">
-		<meta attribute="eclassName">ExternalTest</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="eObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
-			<column not-null="false" unique="false" name="`eobject`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
-				<param name="eclassName">EObject</param>
-				<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
-			</type>
-		</property>
-		<list name="eObjects" table="`externaltest_eobjects`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`externaltest_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`externaltest_eobjects_idx`"/>
-			<element>
-				<type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
-					<param name="eclassName">EObject</param>
-					<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
-				</type>
-			</element>
-		</list>
-	</class>
-</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/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 8f6da5032..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<list name="authors" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="book_authors">
-				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_authors_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index da5f38c1e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<list name="authors" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="book_authors">
-				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_authors_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 160cb73d2..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExtraLazyAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<list name="authors" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="book_authors">
-				<column name="`book_authors_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`book_authors_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/extralazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 3955997ec..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" discriminator-value="Role" table="`role`">
-		<meta attribute="eclassName">Role</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="roledtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="users" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`role_user`">
-			<collection-id column="idbag_id" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`role_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="User" unique="false" foreign-key="role_users">
-				<column name="`user_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</idbag>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="userdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myjoin`">
-			<collection-id column="idbag_id" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Role" unique="false" foreign-key="user_roles">
-				<column name="`role_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</idbag>
-	</class>
-</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/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index f771ed9de..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`role`">
-		<meta attribute="eclassName">Role</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="users" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`role_user`">
-			<collection-id column="idbag_id" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`role_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="User" unique="false" foreign-key="role_users">
-				<column name="`user_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</idbag>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myjoin`">
-			<collection-id column="idbag_id" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Role" unique="false" foreign-key="user_roles">
-				<column name="`role_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</idbag>
-	</class>
-</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/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index f771ed9de..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ForcedIdBagAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.RoleImpl" entity-name="Role" abstract="false" lazy="false" table="`role`">
-		<meta attribute="eclassName">Role</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="users" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`role_user`">
-			<collection-id column="idbag_id" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`role_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="User" unique="false" foreign-key="role_users">
-				<column name="`user_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</idbag>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/Forcedidbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myjoin`">
-			<collection-id column="idbag_id" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Role" unique="false" foreign-key="user_roles">
-				<column name="`role_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</idbag>
-	</class>
-</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/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 102adf6fa..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<map name="writersByName" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writersbyname">
-				<column name="`join_column_writer`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String">
-				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
-			</map-key>
-			<one-to-many entity-name="Writer"/>
-		</map>
-		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_citybywriter">
-				<column name="`join_column_city`" not-null="false" unique="false"/>
-			</key>
-			<map-key-many-to-many entity-name="Writer">
-				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
-			</map-key-many-to-many>
-			<one-to-many entity-name="City"/>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" discriminator-value="City" table="`city`">
-		<meta attribute="eclassName">City</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="citydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
-			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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="`thenameofthewriter`"/>
-		</property>
-	</class>
-</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/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index c9f2b5e6f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<map name="writersByName" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writersbyname">
-				<column name="`join_column_writer`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String">
-				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
-			</map-key>
-			<one-to-many entity-name="Writer"/>
-		</map>
-		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_citybywriter">
-				<column name="`join_column_city`" not-null="false" unique="false"/>
-			</key>
-			<map-key-many-to-many entity-name="Writer">
-				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
-			</map-key-many-to-many>
-			<one-to-many entity-name="City"/>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
-		<meta attribute="eclassName">City</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
-			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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="`thenameofthewriter`"/>
-		</property>
-	</class>
-</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/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index c9f2b5e6f..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/HbMapKeysAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<map name="writersByName" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_writersbyname">
-				<column name="`join_column_writer`" not-null="false" unique="false"/>
-			</key>
-			<map-key type="java.lang.String">
-				<column not-null="false" unique="false" name="`thenameofthewriter`"/>
-			</map-key>
-			<one-to-many entity-name="Writer"/>
-		</map>
-		<map name="cityByWriter" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="book_citybywriter">
-				<column name="`join_column_city`" not-null="false" unique="false"/>
-			</key>
-			<map-key-many-to-many entity-name="Writer">
-				<column not-null="true" unique="false" name="`the_citywriter_id`"/>
-			</map-key-many-to-many>
-			<one-to-many entity-name="City"/>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.CityImpl" entity-name="City" abstract="false" lazy="false" table="`city`">
-		<meta attribute="eclassName">City</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="cityWriter" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="city_citywriter" insert="true" update="true" not-null="true">
-			<column not-null="true" unique="false" name="`the_citywriter_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.hbmapkeys.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hbmapkeys</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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="`thenameofthewriter`"/>
-		</property>
-	</class>
-</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/IdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 6715ef6d7..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
-		<meta attribute="eclassName">IdentityID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="identity"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="identityiddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" discriminator-value="SimpleID" table="`simpleid`">
-		<meta attribute="eclassName">SimpleID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="autoID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`autod`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="simpleiddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`">
-		<meta attribute="eclassName">TableID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">uid_table</param>
-				<param name="column">next_hi_value_column</param>
-			</generator>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="tableiddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" entity-name="TableGeneratorID" abstract="false" lazy="false" discriminator-value="TableGeneratorID" table="`tablegeneratorid`">
-		<meta attribute="eclassName">TableGeneratorID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">TGEN</param>
-				<param name="column">VAL_COL</param>
-				<param name="max_lo">49</param>
-			</generator>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="tablegeneratoriddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" entity-name="AutoID" abstract="false" lazy="false" discriminator-value="AutoID" table="`autoid`">
-		<meta attribute="eclassName">AutoID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="autoID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`autoid`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="autoiddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.OtherTableGeneratorIDImpl" entity-name="OtherTableGeneratorID" abstract="false" lazy="false" discriminator-value="OtherTableGeneratorID" table="`othertablegeneratorid`">
-		<meta attribute="eclassName">OtherTableGeneratorID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">OTHERTGEN</param>
-				<param name="column">VAL_COL</param>
-				<param name="max_lo">49</param>
-			</generator>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="othertablegeneratoriddtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/IdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index b71c3c73c..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
-		<meta attribute="eclassName">IdentityID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="identity"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
-		<meta attribute="eclassName">SimpleID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="autoID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`autod`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
-		<meta attribute="eclassName">TableID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">uid_table</param>
-				<param name="column">next_hi_value_column</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" entity-name="TableGeneratorID" abstract="false" lazy="false" table="`tablegeneratorid`">
-		<meta attribute="eclassName">TableGeneratorID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">TGEN</param>
-				<param name="column">VAL_COL</param>
-				<param name="max_lo">49</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" entity-name="AutoID" abstract="false" lazy="false" table="`autoid`">
-		<meta attribute="eclassName">AutoID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="autoID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`autoid`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.OtherTableGeneratorIDImpl" entity-name="OtherTableGeneratorID" abstract="false" lazy="false" table="`othertablegeneratorid`">
-		<meta attribute="eclassName">OtherTableGeneratorID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">OTHERTGEN</param>
-				<param name="column">VAL_COL</param>
-				<param name="max_lo">49</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/IdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index b71c3c73c..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
-		<meta attribute="eclassName">IdentityID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="identity"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.SimpleIDImpl" entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
-		<meta attribute="eclassName">SimpleID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="autoID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`autod`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
-		<meta attribute="eclassName">TableID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">uid_table</param>
-				<param name="column">next_hi_value_column</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl" entity-name="TableGeneratorID" abstract="false" lazy="false" table="`tablegeneratorid`">
-		<meta attribute="eclassName">TableGeneratorID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">TGEN</param>
-				<param name="column">VAL_COL</param>
-				<param name="max_lo">49</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" entity-name="AutoID" abstract="false" lazy="false" table="`autoid`">
-		<meta attribute="eclassName">AutoID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="autoID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`autoid`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.OtherTableGeneratorIDImpl" entity-name="OtherTableGeneratorID" abstract="false" lazy="false" table="`othertablegeneratorid`">
-		<meta attribute="eclassName">OtherTableGeneratorID</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta>
-		<id name="myid" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-			<generator class="hilo">
-				<param name="table">OTHERTGEN</param>
-				<param name="column">VAL_COL</param>
-				<param name="max_lo">49</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/IdBagAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index a9fe620e5..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="userdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
-			<collection-id column="ID" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
-			</key>
-			<element type="java.lang.String"/>
-		</idbag>
-	</class>
-</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/IdBagAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 26a9bfb13..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
-			<collection-id column="ID" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
-			</key>
-			<element type="java.lang.String"/>
-		</idbag>
-	</class>
-</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/IdBagAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 2c7ab85db..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
-			<collection-id column="ID" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
-			</key>
-			<element type="java.lang.String"/>
-		</idbag>
-		<idbag name="addresses" lazy="true" cascade="all,delete-orphan">
-			<collection-id column="ID" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true" foreign-key="user_addresses">
-				<column name="`user_addresses_e_id`" not-null="false" unique="false"/>
-			</key>
-			<many-to-many entity-name="Address"/>
-		</idbag>
-	</class>
-</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/IdBagAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 26a9bfb13..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
-			<collection-id column="ID" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
-			</key>
-			<element type="java.lang.String"/>
-		</idbag>
-	</class>
-</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/IdBagAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index a9fe620e5..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IdBagAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl.UserImpl" entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
-		<meta attribute="eclassName">User</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/idbag</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="userdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<idbag name="roles" table="`user_roles`" lazy="true" cascade="all,delete-orphan">
-			<collection-id column="ID" type="long">
-				<generator class="increment"/>
-			</collection-id>
-			<key update="true">
-				<column name="`user_roles_e_id`" not-null="true" unique="false"/>
-			</key>
-			<element type="java.lang.String"/>
-		</idbag>
-	</class>
-</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/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 4ef4e5b86..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	</union-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" discriminator-value="ChildOne">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-	</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/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 41053b1c3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	</union-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`parentone_e_id`"/>
-		</key>
-	</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/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 41053b1c3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	</union-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`parentone_e_id`"/>
-		</key>
-	</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/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 86a59879b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`customer_e_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.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentTwo" table="`childone`">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`parentone_e_id`"/>
-		</key>
-	</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/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 84ead78d0..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="mypriceDISCRIMINATOR" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" discriminator-value="SpecificCustomer">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentTwo" discriminator-value="ChildOne">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-	</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/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 4ef4e5b86..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	</union-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" discriminator-value="ChildOne">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-	</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/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 41053b1c3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	</union-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`parentone_e_id`"/>
-		</key>
-	</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/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 41053b1c3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DISCRIMINATOR" index="discrIndex,ohterindex" length="120"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`unitedstatesaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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>
-	</union-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`parentone_e_id`"/>
-		</key>
-	</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/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index efcbd7bb6..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" table="`internationalprice`">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<property name="currency" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`currency`"/>
-		</property>
-	</union-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" table="`specificcustomer`">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`customer_e_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.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" table="`childone`">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`parentone_e_id`"/>
-		</key>
-	</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/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 66184f2ba..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
-		<param name="edatatype">USStateObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" entity-name="Address" abstract="true" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="street" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ContentListImpl" entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`">
-		<meta attribute="eclassName">ContentList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="contentlistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_address">
-				<column name="`contentlist_address_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_address_idx`"/>
-			<one-to-many entity-name="Address"/>
-		</list>
-		<list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="contentlist_price">
-				<column name="`contentlist_price_name`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`contentlist_price_idx`"/>
-			<one-to-many entity-name="Price"/>
-		</list>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.UKAddressImpl" entity-name="UKAddress" abstract="false" lazy="false" extends="Address" table="`ukaddress`">
-		<meta attribute="eclassName">UKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</key>
-		<property name="postcode" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`postcode`"/>
-		</property>
-	</joined-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.DistrictUKAddressImpl" entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`">
-		<meta attribute="eclassName">DistrictUKAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`ukaddress_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.PriceImpl" entity-name="Price" abstract="false" lazy="false" table="`myprice`">
-		<meta attribute="eclassName">Price</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id name="name" type="java.lang.String">
-			<column not-null="true" unique="false" name="`name`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="value" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
-			<column not-null="true" unique="false" name="`value`"/>
-		</property>
-	</class>
-	<union-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.InternationalPriceImpl" entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" table="`internationalprice`">
-		<meta attribute="eclassName">InternationalPrice</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<property name="currency" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`currency`"/>
-		</property>
-	</union-subclass>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.USAddressImpl" entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`">
-		<meta attribute="eclassName">USAddress</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<key>
-			<column name="`address_name`"/>
-		</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.samples.emf.annotations.inheritancemapping.impl.CustomerImpl" entity-name="Customer" abstract="false" lazy="false" discriminator-value="Customer" table="`customer`">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="customerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.SpecificCustomerImpl" entity-name="SpecificCustomer" abstract="false" lazy="false" extends="Customer" discriminator-value="SpecificCustomer">
-		<meta attribute="eclassName">SpecificCustomer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</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.samples.emf.annotations.inheritancemapping.impl.UKAddressListImpl" entity-name="UKAddressList" abstract="false" lazy="false" discriminator-value="UKAddressList" table="`ukaddresslist`">
-		<meta attribute="eclassName">UKAddressList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="ukaddresslistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="ukaddresslist_address">
-				<column name="`ukaddresslist_address_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`ukaddresslist_address_idx`"/>
-			<one-to-many entity-name="UKAddress"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentOneImpl" entity-name="ParentOne" abstract="false" lazy="false" discriminator-value="ParentOne" table="`parentone`">
-		<meta attribute="eclassName">ParentOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parentonedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ParentTwoImpl" entity-name="ParentTwo" abstract="false" lazy="false" discriminator-value="ParentTwo" table="`parenttwo`">
-		<meta attribute="eclassName">ParentTwo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="parenttwodtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.ChildOneImpl" entity-name="ChildOne" abstract="false" lazy="false" extends="ParentOne" discriminator-value="ChildOne">
-		<meta attribute="eclassName">ChildOne</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta>
-	</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/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 506985450..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperImpl" entity-name="Super" abstract="false" lazy="false" discriminator-value="80248667" table="`super_table`">
-		<meta attribute="eclassName">Super</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="integer">
-			<column name="DISC" index="SUPER_TABLEDISC" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubImpl" entity-name="Sub" abstract="false" lazy="false" extends="Super" discriminator-value="83488">
-		<meta attribute="eclassName">Sub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.OtherSubImpl" entity-name="OtherSub" abstract="false" lazy="false" extends="Super" discriminator-value="500">
-		<meta attribute="eclassName">OtherSub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<subclass entity-name="AbstractSub" abstract="true" lazy="false" extends="Super" discriminator-value="950694558">
-		<meta attribute="eclassName">AbstractSub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperFormulaImpl" entity-name="SuperFormula" abstract="false" lazy="false" discriminator-value="1" table="`superformula`">
-		<meta attribute="eclassName">SuperFormula</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator formula="case when name like 'R%' then 0 when name like 'G%' then 1 else 2 end"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubFormulaImpl" entity-name="SubFormula" abstract="false" lazy="false" extends="SuperFormula" discriminator-value="0">
-		<meta attribute="eclassName">SubFormula</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</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/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 506985450..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperImpl" entity-name="Super" abstract="false" lazy="false" discriminator-value="80248667" table="`super_table`">
-		<meta attribute="eclassName">Super</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="integer">
-			<column name="DISC" index="SUPER_TABLEDISC" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubImpl" entity-name="Sub" abstract="false" lazy="false" extends="Super" discriminator-value="83488">
-		<meta attribute="eclassName">Sub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.OtherSubImpl" entity-name="OtherSub" abstract="false" lazy="false" extends="Super" discriminator-value="500">
-		<meta attribute="eclassName">OtherSub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<subclass entity-name="AbstractSub" abstract="true" lazy="false" extends="Super" discriminator-value="950694558">
-		<meta attribute="eclassName">AbstractSub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperFormulaImpl" entity-name="SuperFormula" abstract="false" lazy="false" discriminator-value="1" table="`superformula`">
-		<meta attribute="eclassName">SuperFormula</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator formula="case when name like 'R%' then 0 when name like 'G%' then 1 else 2 end"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubFormulaImpl" entity-name="SubFormula" abstract="false" lazy="false" extends="SuperFormula" discriminator-value="0">
-		<meta attribute="eclassName">SubFormula</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</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/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 506985450..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperImpl" entity-name="Super" abstract="false" lazy="false" discriminator-value="80248667" table="`super_table`">
-		<meta attribute="eclassName">Super</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="integer">
-			<column name="DISC" index="SUPER_TABLEDISC" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubImpl" entity-name="Sub" abstract="false" lazy="false" extends="Super" discriminator-value="83488">
-		<meta attribute="eclassName">Sub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.OtherSubImpl" entity-name="OtherSub" abstract="false" lazy="false" extends="Super" discriminator-value="500">
-		<meta attribute="eclassName">OtherSub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<subclass entity-name="AbstractSub" abstract="true" lazy="false" extends="Super" discriminator-value="950694558">
-		<meta attribute="eclassName">AbstractSub</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SuperFormulaImpl" entity-name="SuperFormula" abstract="false" lazy="false" discriminator-value="1" table="`superformula`">
-		<meta attribute="eclassName">SuperFormula</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator formula="case when name like 'R%' then 0 when name like 'G%' then 1 else 2 end"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl.SubFormulaImpl" entity-name="SubFormula" abstract="false" lazy="false" extends="SuperFormula" discriminator-value="0">
-		<meta attribute="eclassName">SubFormula</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminator</meta>
-	</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/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index d3cc89d96..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bookdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="librarydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="false" cascade="all,delete-orphan">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="false" cascade="all,delete-orphan">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="writerdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 091eb79b0..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="false" cascade="all,delete-orphan">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="false" cascade="all,delete-orphan">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 091eb79b0..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LazyLibraryAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
-		<param name="edatatype">BookCategoryObject</param>
-	</typedef>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`book`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`"/>
-		</property>
-		<property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`pages`"/>
-		</property>
-		<property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`category`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param>
-				<param name="eclassifier">BookCategory</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param>
-			</type>
-		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.LibraryImpl" entity-name="Library" abstract="false" lazy="false" table="`library`">
-		<meta attribute="eclassName">Library</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="writers" lazy="false" cascade="all,delete-orphan">
-			<key update="true" foreign-key="library_writers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_writers_idx`"/>
-			<one-to-many entity-name="Writer"/>
-		</list>
-		<list name="books" lazy="false" cascade="all,delete-orphan">
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`library_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`writer`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<list name="books" lazy="true" cascade="merge,persist,save-update,lock">
-			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`writer_books_idx`"/>
-			<one-to-many entity-name="Book"/>
-		</list>
-	</class>
-</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/LobAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 84d1215d0..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
-		</property>
-	</class>
-</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/LobAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 2d0258238..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
-		</property>
-	</class>
-</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/LobAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 2d0258238..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
-		</property>
-	</class>
-</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/LobAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 26b334b3b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`id`"/>
-		</property>
-		<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>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
-		</property>
-	</class>
-</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/LobAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 21361fc82..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/LobAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lob</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
-			<column not-null="false" unique="false" name="`id`"/>
-		</property>
-		<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>
-		<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-			<column not-null="false" unique="false" name="`address`"/>
-		</property>
-		<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-			<column not-null="false" unique="false" name="`photo`" length="1000000"/>
-		</property>
-	</class>
-</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/ManyToManyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 69fb86755..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`">
-		<meta attribute="eclassName">Cntr</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="cntrdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<bag name="rght" lazy="false" cascade="merge,persist,save-update,lock" table="`rightcenter`">
-			<key update="true">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Rght" unique="false" foreign-key="cntr_rght">
-				<column name="`rght_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-		<list name="lft" lazy="false" cascade="merge,persist,save-update,lock" table="`cntr_lft`">
-			<key update="true">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`cntr_lft_idx`"/>
-			<many-to-many entity-name="Lft" unique="false" foreign-key="cntr_lft">
-				<column name="`lft_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.LftImpl" entity-name="Lft" abstract="false" lazy="false" discriminator-value="Lft" table="`lft`">
-		<meta attribute="eclassName">Lft</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="lftdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="cntr" lazy="true" cascade="merge,persist,save-update,lock" table="`lft_cntr`">
-			<key update="true">
-				<column name="`lft_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`lft_cntr_idx`"/>
-			<many-to-many entity-name="Cntr" unique="false" foreign-key="lft_cntr">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.RghtImpl" entity-name="Rght" abstract="false" lazy="false" discriminator-value="Rght" table="`rght`">
-		<meta attribute="eclassName">Rght</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="rghtdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<bag name="cntr" lazy="true" cascade="merge,persist,save-update,lock" inverse="true" table="`rightcenter`">
-			<key update="true">
-				<column name="`rght_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Cntr" unique="false" foreign-key="rght_cntr">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/ManyToManyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index fc0b8598d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" entity-name="Cntr" abstract="false" lazy="false" table="`cntr`">
-		<meta attribute="eclassName">Cntr</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<bag name="rght" lazy="false" cascade="merge,persist,save-update,lock" table="`rightcenter`">
-			<key update="true">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Rght" unique="false" foreign-key="cntr_rght">
-				<column name="`rght_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-		<list name="lft" lazy="false" cascade="merge,persist,save-update,lock" table="`cntr_lft`">
-			<key update="true">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`cntr_lft_idx`"/>
-			<many-to-many entity-name="Lft" unique="false" foreign-key="cntr_lft">
-				<column name="`lft_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.LftImpl" entity-name="Lft" abstract="false" lazy="false" table="`lft`">
-		<meta attribute="eclassName">Lft</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="cntr" lazy="true" cascade="merge,persist,save-update,lock" table="`lft_cntr`">
-			<key update="true">
-				<column name="`lft_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`lft_cntr_idx`"/>
-			<many-to-many entity-name="Cntr" unique="false" foreign-key="lft_cntr">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.RghtImpl" entity-name="Rght" abstract="false" lazy="false" table="`rght`">
-		<meta attribute="eclassName">Rght</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<bag name="cntr" lazy="true" cascade="merge,persist,save-update,lock" inverse="true" table="`rightcenter`">
-			<key update="true">
-				<column name="`rght_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Cntr" unique="false" foreign-key="rght_cntr">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/ManyToManyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index fc0b8598d..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ManyToManyAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" entity-name="Cntr" abstract="false" lazy="false" table="`cntr`">
-		<meta attribute="eclassName">Cntr</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<bag name="rght" lazy="false" cascade="merge,persist,save-update,lock" table="`rightcenter`">
-			<key update="true">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Rght" unique="false" foreign-key="cntr_rght">
-				<column name="`rght_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-		<list name="lft" lazy="false" cascade="merge,persist,save-update,lock" table="`cntr_lft`">
-			<key update="true">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`cntr_lft_idx`"/>
-			<many-to-many entity-name="Lft" unique="false" foreign-key="cntr_lft">
-				<column name="`lft_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.LftImpl" entity-name="Lft" abstract="false" lazy="false" table="`lft`">
-		<meta attribute="eclassName">Lft</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="cntr" lazy="true" cascade="merge,persist,save-update,lock" table="`lft_cntr`">
-			<key update="true">
-				<column name="`lft_e_id`" not-null="true" unique="false"/>
-			</key>
-			<list-index column="`lft_cntr_idx`"/>
-			<many-to-many entity-name="Cntr" unique="false" foreign-key="lft_cntr">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</list>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.RghtImpl" entity-name="Rght" abstract="false" lazy="false" table="`rght`">
-		<meta attribute="eclassName">Rght</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/manytomany</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<bag name="cntr" lazy="true" cascade="merge,persist,save-update,lock" inverse="true" table="`rightcenter`">
-			<key update="true">
-				<column name="`rght_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="Cntr" unique="false" foreign-key="rght_cntr">
-				<column name="`cntr_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/MapKeyAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index f3257d236..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`BOOK`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="BOOKDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`TITLE`"/>
-		</property>
-		<map name="writers" where="name='martin'" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="BOOK_WRITERS">
-				<column name="`BOOK_WRITERS_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<map-key column="`NAME`" type="java.lang.String"/>
-			<one-to-many entity-name="Writer"/>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`WRITER`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="WRITERDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/MapKeyAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index a3349280a..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`BOOK`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`TITLE`"/>
-		</property>
-		<map name="writers" where="name='martin'" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="BOOK_WRITERS">
-				<column name="`BOOK_WRITERS_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<map-key column="`NAME`" type="java.lang.String"/>
-			<one-to-many entity-name="Writer"/>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`WRITER`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/MapKeyAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index a3349280a..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MapKeyAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`BOOK`">
-		<meta attribute="eclassName">Book</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`TITLE`"/>
-		</property>
-		<map name="writers" where="name='martin'" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="BOOK_WRITERS">
-				<column name="`BOOK_WRITERS_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<map-key column="`NAME`" type="java.lang.String"/>
-			<one-to-many entity-name="Writer"/>
-		</map>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl.WriterImpl" entity-name="Writer" abstract="false" lazy="false" table="`WRITER`">
-		<meta attribute="eclassName">Writer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mapkey</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index a92764da5..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" entity-name="AddIDDocument" abstract="false" lazy="false" discriminator-value="AddIDDocument" table="`addiddocument`">
-		<meta attribute="eclassName">AddIDDocument</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
-		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addiddocumentdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`mygenericinfo`"/>
-		</property>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.SpecificDocumentImpl" entity-name="SpecificDocument" abstract="false" lazy="false" discriminator-value="SpecificDocument" table="`specificdocument`">
-		<meta attribute="eclassName">SpecificDocument</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
-		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="specificdocumentdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`mygenericinfo`"/>
-		</property>
-		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`parentdocument_name`" length="50"/>
-		</property>
-		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`myspecificinfo`"/>
-		</property>
-	</class>
-</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/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index e4029ef12..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" entity-name="AddIDDocument" abstract="false" lazy="false" table="`addiddocument`">
-		<meta attribute="eclassName">AddIDDocument</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
-		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`mygenericinfo`"/>
-		</property>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.SpecificDocumentImpl" entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`">
-		<meta attribute="eclassName">SpecificDocument</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
-		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`mygenericinfo`"/>
-		</property>
-		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`parentdocument_name`" length="50"/>
-		</property>
-		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`myspecificinfo`"/>
-		</property>
-	</class>
-</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/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index e4029ef12..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" entity-name="AddIDDocument" abstract="false" lazy="false" table="`addiddocument`">
-		<meta attribute="eclassName">AddIDDocument</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
-		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`mygenericinfo`"/>
-		</property>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.SpecificDocumentImpl" entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`">
-		<meta attribute="eclassName">SpecificDocument</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
-		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`mygenericinfo`"/>
-		</property>
-		<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`parentdocument_name`" length="50"/>
-		</property>
-		<property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`myspecificinfo`"/>
-		</property>
-	</class>
-</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/NaturalIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 9a7ab19af..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<natural-id mutable="false">
-			<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</property>
-			<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</property>
-			<many-to-one name="family" entity-name="Family" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_family" insert="true" update="true" not-null="true">
-				<column not-null="true" unique="false" name="`family_family_id`"/>
-			</many-to-one>
-		</natural-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`age`"/>
-		</property>
-		<property name="callName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`callname`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" discriminator-value="Family" table="`family`">
-		<meta attribute="eclassName">Family</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="familydtype" length="255" not-null="true"/>
-		</discriminator>
-		<natural-id mutable="false">
-			<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>
-		</natural-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`age`"/>
-		</property>
-	</class>
-</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/NaturalIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 6cc97e462..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<natural-id mutable="false">
-			<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</property>
-			<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</property>
-			<many-to-one name="family" entity-name="Family" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_family" insert="true" update="true" not-null="true">
-				<column not-null="true" unique="false" name="`family_family_id`"/>
-			</many-to-one>
-		</natural-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`age`"/>
-		</property>
-		<property name="callName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`callname`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" table="`family`">
-		<meta attribute="eclassName">Family</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<natural-id mutable="false">
-			<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>
-		</natural-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`age`"/>
-		</property>
-	</class>
-</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/NaturalIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 6cc97e462..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/NaturalIdAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<natural-id mutable="false">
-			<property name="firstName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`firstname`"/>
-			</property>
-			<property name="lastName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-				<column not-null="true" unique="false" name="`lastname`"/>
-			</property>
-			<many-to-one name="family" entity-name="Family" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_family" insert="true" update="true" not-null="true">
-				<column not-null="true" unique="false" name="`family_family_id`"/>
-			</many-to-one>
-		</natural-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`age`"/>
-		</property>
-		<property name="callName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`callname`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl.FamilyImpl" entity-name="Family" abstract="false" lazy="false" table="`family`">
-		<meta attribute="eclassName">Family</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/naturalid</meta>
-		<id name="id" type="int" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<natural-id mutable="false">
-			<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>
-		</natural-id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="age" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`age`"/>
-		</property>
-	</class>
-</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/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 6936c9df1..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="foreign">
-				<param name="property">employeeInfo</param>
-			</generator>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="employeedtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" foreign-key="employee_employeeinfo" insert="true" update="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" discriminator-value="EmployeeInfo" table="`employeeinfo`">
-		<meta attribute="eclassName">EmployeeInfo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="employeeinfodtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 034c1449e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="foreign">
-				<param name="property">employeeInfo</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" foreign-key="employee_employeeinfo" insert="true" update="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" table="`employeeinfo`">
-		<meta attribute="eclassName">EmployeeInfo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 034c1449e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" table="`employee`">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="foreign">
-				<param name="property">employeeInfo</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" lazy="false" foreign-key="employee_employeeinfo" insert="true" update="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" table="`employeeinfo`">
-		<meta attribute="eclassName">EmployeeInfo</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/otopk</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`id`"/>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 3fdd54abb..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`age`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<join table="`secondary_table`">
-			<key/>
-			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
-				<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="`emp_num`"/>
-			</property>
-		</join>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
-		<meta attribute="eclassName">NonEmployee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
-			<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.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" discriminator-value="Country" table="`country`">
-		<meta attribute="eclassName">Country</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="countrydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index c4a381845..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`age`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<join table="`secondary_table`">
-			<key/>
-			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
-				<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="`emp_num`"/>
-			</property>
-		</join>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
-		<meta attribute="eclassName">NonEmployee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
-			<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.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
-		<meta attribute="eclassName">Country</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index c4a381845..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`age`"/>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
-		<meta attribute="eclassName">Employee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<join table="`secondary_table`">
-			<key/>
-			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
-				<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="`emp_num`"/>
-			</property>
-		</join>
-	</subclass>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
-		<meta attribute="eclassName">NonEmployee</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
-			<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.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
-		<meta attribute="eclassName">Country</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index d8d35b3d3..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-			<generator class="foreign">
-				<param name="property">head</param>
-			</generator>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bodydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="true" lazy="false" foreign-key="body_head" insert="true" update="true" unique="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
-		<id name="myID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="headdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 751c24f38..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-			<generator class="foreign">
-				<param name="property">head</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="true" lazy="false" foreign-key="body_head" insert="true" update="true" unique="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
-		<id name="myID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 751c24f38..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-			<generator class="foreign">
-				<param name="property">head</param>
-			</generator>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="true" lazy="false" foreign-key="body_head" insert="true" update="true" unique="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta>
-		<id name="myID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`myid`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index ecc00b32a..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`ID`"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="PERSONDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<join table="`PERSON_ADDRESS`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="address" lazy="false" insert="true" update="true" not-null="true" unique="false" type="text">
-				<column not-null="true" unique="false" name="`ADDRESS`"/>
-			</property>
-		</join>
-		<join table="`PERSON_PHOTO`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
-			</property>
-		</join>
-	</class>
-</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/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 2de4bd693..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`ID`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<join table="`PERSON_ADDRESS`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="address" lazy="false" insert="true" update="true" not-null="true" unique="false" type="text">
-				<column not-null="true" unique="false" name="`ADDRESS`"/>
-			</property>
-		</join>
-		<join table="`PERSON_PHOTO`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
-			</property>
-		</join>
-	</class>
-</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/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 2de4bd693..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`ID`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<join table="`PERSON_ADDRESS`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="address" lazy="false" insert="true" update="true" not-null="true" unique="false" type="text">
-				<column not-null="true" unique="false" name="`ADDRESS`"/>
-			</property>
-		</join>
-		<join table="`PERSON_PHOTO`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
-			</property>
-		</join>
-	</class>
-</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/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 7a542ac8e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`ID`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<join table="`PERSON_ADDRESS`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-				<column not-null="false" unique="false" name="`ADDRESS`"/>
-			</property>
-		</join>
-		<join table="`PERSON_PHOTO`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
-			</property>
-		</join>
-	</class>
-</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/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 63ebe7c4e..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta>
-		<id name="id" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`ID`"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="PERSONDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<join table="`PERSON_ADDRESS`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
-				<column not-null="false" unique="false" name="`ADDRESS`"/>
-			</property>
-		</join>
-		<join table="`PERSON_PHOTO`">
-			<key>
-				<column name="`ID`"/>
-			</key>
-			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
-				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
-			</property>
-		</join>
-	</class>
-</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/SetAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 542a8de78..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" discriminator-value="testSet.ContainedItem" table="`TESTSET_CONTAINEDITEM`">
-		<meta attribute="eclassName">ContainedItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="TESTSET_CONTAINEDITEMDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" discriminator-value="testSet.Item" table="`TESTSET_ITEM`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="TESTSET_ITEMDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" discriminator-value="testSet.ItemList" table="`TESTSET_ITEMLIST`">
-		<meta attribute="eclassName">ItemList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="DTYPE" index="TESTSET_ITEMLISTDTYPE" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
-				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.ContainedItem"/>
-		</bag>
-		<bag name="item" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.Item"/>
-		</bag>
-		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
-				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.Item"/>
-		</bag>
-	</class>
-</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/SetAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index dd3c2ac71..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
-		<meta attribute="eclassName">ContainedItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
-		<meta attribute="eclassName">ItemList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
-				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.ContainedItem"/>
-		</bag>
-		<bag name="item" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.Item"/>
-		</bag>
-		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
-				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.Item"/>
-		</bag>
-	</class>
-</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/SetAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index dd3c2ac71..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="testSet.ContainedItem" abstract="false" lazy="false" table="`TESTSET_CONTAINEDITEM`">
-		<meta attribute="eclassName">ContainedItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="testSet.Item" abstract="false" lazy="false" table="`TESTSET_ITEM`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="itemList" entity-name="testSet.ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSET_ITEM_ITEMLIST" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`ITEM_ITEMLIST_E_ID`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="testSet.ItemList" abstract="false" lazy="false" table="`TESTSET_ITEMLIST`">
-		<meta attribute="eclassName">ItemList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
-				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.ContainedItem"/>
-		</bag>
-		<bag name="item" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`ITEM_ITEMLIST_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.Item"/>
-		</bag>
-		<bag name="joinedItem" order-by="`NAME` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
-				<column name="`ITEMLIST_JOINEDITEM_E_ID`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="testSet.Item"/>
-		</bag>
-	</class>
-</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/SetNMAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 0cf055e9b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`">
-		<meta attribute="eclassName">MyItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="myitemdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`myitem_youritem`">
-			<key update="true">
-				<column name="`myitem_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="YourItem" unique="false" foreign-key="myitem_youritem">
-				<column name="`youritem_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.YourItemImpl" entity-name="YourItem" abstract="false" lazy="false" discriminator-value="YourItem" table="`youritem`">
-		<meta attribute="eclassName">YourItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="youritemdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myitem_youritem`">
-			<key update="true">
-				<column name="`youritem_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="MyItem" unique="false" foreign-key="youritem_myitem">
-				<column name="`myitem_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/SetNMAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 7988fd35b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" entity-name="MyItem" abstract="false" lazy="false" table="`myitem`">
-		<meta attribute="eclassName">MyItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`myitem_youritem`">
-			<key update="true">
-				<column name="`myitem_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="YourItem" unique="false" foreign-key="myitem_youritem">
-				<column name="`youritem_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.YourItemImpl" entity-name="YourItem" abstract="false" lazy="false" table="`youritem`">
-		<meta attribute="eclassName">YourItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myitem_youritem`">
-			<key update="true">
-				<column name="`youritem_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="MyItem" unique="false" foreign-key="youritem_myitem">
-				<column name="`myitem_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/SetNMAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 7988fd35b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetNMAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" entity-name="MyItem" abstract="false" lazy="false" table="`myitem`">
-		<meta attribute="eclassName">MyItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="`myitem_youritem`">
-			<key update="true">
-				<column name="`myitem_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="YourItem" unique="false" foreign-key="myitem_youritem">
-				<column name="`youritem_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.YourItemImpl" entity-name="YourItem" abstract="false" lazy="false" table="`youritem`">
-		<meta attribute="eclassName">YourItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/nmset</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="`myitem_youritem`">
-			<key update="true">
-				<column name="`youritem_e_id`" not-null="true" unique="false"/>
-			</key>
-			<many-to-many entity-name="MyItem" unique="false" foreign-key="youritem_myitem">
-				<column name="`myitem_e_id`" not-null="true" unique="false"/>
-			</many-to-many>
-		</bag>
-	</class>
-</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/SetResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index f28794516..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`">
-		<meta attribute="eclassName">ContainedItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="containeditemdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="itemdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="itemList" entity-name="ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_itemlist" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`item_itemlist_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="ItemList" abstract="false" lazy="false" discriminator-value="ItemList" table="`itemlist`">
-		<meta attribute="eclassName">ItemList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="itemlistdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="itemlist_containeditem">
-				<column name="`itemlist_containeditem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="ContainedItem"/>
-		</bag>
-		<bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`item_itemlist_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="Item"/>
-		</bag>
-		<bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="itemlist_joineditem">
-				<column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="Item"/>
-		</bag>
-	</class>
-</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/SetResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index e128fa42b..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
-		<meta attribute="eclassName">ContainedItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="itemList" entity-name="ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_itemlist" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`item_itemlist_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`">
-		<meta attribute="eclassName">ItemList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="itemlist_containeditem">
-				<column name="`itemlist_containeditem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="ContainedItem"/>
-		</bag>
-		<bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`item_itemlist_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="Item"/>
-		</bag>
-		<bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="itemlist_joineditem">
-				<column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="Item"/>
-		</bag>
-	</class>
-</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/SetResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index c114afa60..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
-		<meta attribute="eclassName">ContainedItem</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`item`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<many-to-one name="itemList" entity-name="ItemList" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_itemlist" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`item_itemlist_e_id`"/>
-		</many-to-one>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemListImpl" entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`">
-		<meta attribute="eclassName">ItemList</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/set</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="itemlist_containeditem">
-				<column name="`itemlist_containeditem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="ContainedItem"/>
-		</bag>
-		<bag name="item" order-by="`name` desc" inverse="true" lazy="extra" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true">
-				<column name="`item_itemlist_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="Item"/>
-		</bag>
-		<bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="itemlist_joineditem">
-				<column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/>
-			</key>
-			<one-to-many entity-name="Item"/>
-		</bag>
-	</class>
-</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/ToOneAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 0462fcdfe..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" discriminator-value="Arm" table="`arm`">
-		<meta attribute="eclassName">Arm</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="armdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`length`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="headdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`haircolor`"/>
-		</property>
-		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
-		<many-to-one name="leftArm" entity-name="Arm" not-null="false" lazy="false" foreign-key="person_leftarm" insert="true" update="true"/>
-	</class>
-</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/ToOneAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 3658199e7..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" table="`arm`">
-		<meta attribute="eclassName">Arm</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`length`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`haircolor`"/>
-		</property>
-		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
-		<many-to-one name="leftArm" entity-name="Arm" not-null="false" lazy="false" foreign-key="person_leftarm" insert="true" update="true"/>
-	</class>
-</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/ToOneAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 3658199e7..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" table="`arm`">
-		<meta attribute="eclassName">Arm</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`length`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`haircolor`"/>
-		</property>
-		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
-		<many-to-one name="leftArm" entity-name="Arm" not-null="false" lazy="false" foreign-key="person_leftarm" insert="true" update="true"/>
-	</class>
-</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/ToOneAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index cc9166ceb..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" table="`arm`">
-		<meta attribute="eclassName">Arm</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`length`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`haircolor`"/>
-		</property>
-		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
-		<many-to-one name="leftArm" entity-name="Arm" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_leftarm" insert="true" update="true" not-null="true">
-			<column not-null="true" unique="false" name="`arm_leftarm_e_id`"/>
-		</many-to-one>
-	</class>
-</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/ToOneAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 8b1c4f3af..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="addressdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="city" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl" entity-name="Arm" abstract="false" lazy="false" discriminator-value="Arm" table="`arm`">
-		<meta attribute="eclassName">Arm</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="armdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="length" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`length`"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
-		<meta attribute="eclassName">Head</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="headdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`haircolor`"/>
-		</property>
-		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head" constrained="true"/>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
-		<meta attribute="eclassName">Person</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/toone</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="persondtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="address" entity-name="Address" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`address_address_e_id`"/>
-		</many-to-one>
-		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
-		<many-to-one name="leftArm" entity-name="Arm" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_leftarm" insert="true" update="true" not-null="true">
-			<column not-null="true" unique="false" name="`arm_leftarm_e_id`"/>
-		</many-to-one>
-	</class>
-</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/TransientAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 8c737e6d8..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bodydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/TransientAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 7cc2c8e07..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/TransientAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 7cc2c8e07..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/TransientAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xjoin_hibernate.hbm.xml
deleted file mode 100755
index 7cc2c8e07..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xjoin_hibernate.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/TransientAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xsingle_hibernate.hbm.xml
deleted file mode 100755
index 8c737e6d8..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/TransientAction_mysql_xsingle_hibernate.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.transent.impl.BodyImpl" entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
-		<meta attribute="eclassName">Body</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta>
-		<id name="theID" type="long" unsaved-value="0">
-			<column not-null="true" unique="false" name="`theid`"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="bodydtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-	</class>
-</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/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index cf3f95caa..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="MYITEMTABLEdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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="`mystr`" unique-key="c0"/>
-		</property>
-		<many-to-one name="project" entity-name="Project" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_project" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`myproject`" unique-key="c0"/>
-		</many-to-one>
-		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ProjectImpl" entity-name="Project" abstract="false" lazy="false" discriminator-value="Project" table="`project`">
-		<meta attribute="eclassName">Project</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string">
-			<column name="dtype" index="projectdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 953ef13ed..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`myitemtable`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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="`mystr`" unique-key="c0"/>
-		</property>
-		<many-to-one name="project" entity-name="Project" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_project" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`myproject`" unique-key="c0"/>
-		</many-to-one>
-		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ProjectImpl" entity-name="Project" abstract="false" lazy="false" table="`project`">
-		<meta attribute="eclassName">Project</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 953ef13ed..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/UniqueConstraintsAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" entity-name="Item" abstract="false" lazy="false" table="`myitemtable`">
-		<meta attribute="eclassName">Item</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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="`mystr`" unique-key="c0"/>
-		</property>
-		<many-to-one name="project" entity-name="Project" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="item_project" insert="true" update="true" not-null="false">
-			<column not-null="false" unique="false" name="`myproject`" unique-key="c0"/>
-		</many-to-one>
-		<property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`myint`" unique-key="c0"/>
-		</property>
-	</class>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ProjectImpl" entity-name="Project" abstract="false" lazy="false" table="`project`">
-		<meta attribute="eclassName">Project</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/uniqueconstraints</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<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>
-	</class>
-</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/VariousAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_a_o_hibernate.hbm.xml
deleted file mode 100755
index 456e8bb59..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_a_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" batch-size="9" discriminator-value="Parent" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator type="string" force="true">
-			<column name="dtype" index="parentdtype" length="255" not-null="true"/>
-		</discriminator>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="children" batch-size="11" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="parent_children">
-				<column name="`parent_children_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_children_idx`"/>
-			<one-to-many entity-name="Child"/>
-		</list>
-		<property name="totalPeople" lazy="false" not-null="false" type="int">
-			<formula>(select count(*) from parent)</formula>
-		</property>
-	</class>
-	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" discriminator-value="Child">
-		<meta attribute="eclassName">Child</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-	</subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ImmutableCityImpl" entity-name="ImmutableCity" abstract="false" lazy="false" mutable="false" table="`immutablecity`">
-		<meta attribute="eclassName">ImmutableCity</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<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>
-		<list name="parents" mutable="false" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="immutablecity_parents">
-				<column name="`immutablecity_parents_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`immutablecity_parents_idx`"/>
-			<one-to-many entity-name="Parent"/>
-		</list>
-	</class>
-</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/VariousAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_e_o_hibernate.hbm.xml
deleted file mode 100755
index 8d0a1a328..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_e_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" batch-size="9" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="children" batch-size="11" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="parent_children">
-				<column name="`parent_children_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_children_idx`"/>
-			<one-to-many entity-name="Child"/>
-		</list>
-		<property name="totalPeople" lazy="false" not-null="false" type="int">
-			<formula>(select count(*) from parent)</formula>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" table="`child`">
-		<meta attribute="eclassName">Child</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<key>
-			<column name="`parent_e_id`"/>
-		</key>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ImmutableCityImpl" entity-name="ImmutableCity" abstract="false" lazy="false" mutable="false" table="`immutablecity`">
-		<meta attribute="eclassName">ImmutableCity</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<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>
-		<list name="parents" mutable="false" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="immutablecity_parents">
-				<column name="`immutablecity_parents_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`immutablecity_parents_idx`"/>
-			<one-to-many entity-name="Parent"/>
-		</list>
-	</class>
-</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/VariousAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_s_o_hibernate.hbm.xml
deleted file mode 100755
index 8d0a1a328..000000000
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_mysql_s_o_hibernate.hbm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" batch-size="9" table="`parent`">
-		<meta attribute="eclassName">Parent</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="children" batch-size="11" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="parent_children">
-				<column name="`parent_children_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`parent_children_idx`"/>
-			<one-to-many entity-name="Child"/>
-		</list>
-		<property name="totalPeople" lazy="false" not-null="false" type="int">
-			<formula>(select count(*) from parent)</formula>
-		</property>
-	</class>
-	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Parent" table="`child`">
-		<meta attribute="eclassName">Child</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<key>
-			<column name="`parent_e_id`"/>
-		</key>
-	</joined-subclass>
-	<class name="org.eclipse.emf.teneo.samples.emf.annotations.various.impl.ImmutableCityImpl" entity-name="ImmutableCity" abstract="false" lazy="false" mutable="false" table="`immutablecity`">
-		<meta attribute="eclassName">ImmutableCity</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/various</meta>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<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>
-		<list name="parents" mutable="false" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key update="true" foreign-key="immutablecity_parents">
-				<column name="`immutablecity_parents_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`immutablecity_parents_idx`"/>
-			<one-to-many entity-name="Parent"/>
-		</list>
-	</class>
-</hibernate-mapping>
\ No newline at end of file
-- 
cgit v1.2.3