solve failing testcase

18 files changed, 47 insertions, 17 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_e_o_hibernate.hbm.xml
index 5b886015f..477298a2a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_e_o_hibernate.hbm.xml
@@ -94,7 +94,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`AUTHOR`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_h_o_hibernate.hbm.xml
index de131434f..5dc65413a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/BZ258266Action_hsqldb_h_o_hibernate.hbm.xml
@@ -106,7 +106,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" discriminator-value="Author" table="`AUTHOR`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_e_o_hibernate.hbm.xml
index 5b886015f..477298a2a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_e_o_hibernate.hbm.xml
@@ -94,7 +94,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`AUTHOR`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_h_o_hibernate.hbm.xml
index de131434f..5dc65413a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz242995Action_hsqldb_h_o_hibernate.hbm.xml
@@ -106,7 +106,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" discriminator-value="Author" table="`AUTHOR`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_e_o_hibernate.hbm.xml
index 0c97958ac..3b985c4b2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_e_o_hibernate.hbm.xml
@@ -94,7 +94,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="false" table="`AUTHOR`">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_h_o_hibernate.hbm.xml
index e4f71629d..964761b2a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz245167Action_hsqldb_h_o_hibernate.hbm.xml
@@ -106,7 +106,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="false" discriminator-value="Author" table="`AUTHOR`">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_e_o_hibernate.hbm.xml
index 5b886015f..477298a2a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_e_o_hibernate.hbm.xml
@@ -94,7 +94,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" table="`AUTHOR`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_h_o_hibernate.hbm.xml
index de131434f..5dc65413a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz292074Action_hsqldb_h_o_hibernate.hbm.xml
@@ -106,7 +106,7 @@
 		<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>
-		<one-to-one name="theAuthor" entity-name="Author" cascade="merge,persist,save-update,lock,refresh" lazy="proxy" constrained="true"/>
+		<one-to-one name="theAuthor" entity-name="Author" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="proxy"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz242995.impl.AuthorImpl" entity-name="Author" abstract="false" lazy="true" discriminator-value="Author" table="`AUTHOR`" proxy="org.eclipse.emf.teneo.samples.issues.bz242995.Author">
 		<meta attribute="eclassName" inherit="false">Author</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_e_o_hibernate.hbm.xml
index 0a8673acb..939d0936c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_e_o_hibernate.hbm.xml
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
-		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="EMPLOYEE_EMPLOYEEINFO" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="EMPLOYEE_EMPLOYEEINFO" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
 	</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" inherit="false">EmployeeInfo</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_h_o_hibernate.hbm.xml
index 60b9cbfdd..85a52f2a2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_hsqldb_h_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
-		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="EMPLOYEE_EMPLOYEEINFO" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="EMPLOYEE_EMPLOYEEINFO" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false"/>
 	</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" inherit="false">EmployeeInfo</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_e_o_hibernate.hbm.xml
index 88b8ac503..d46aec268 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_e_o_hibernate.hbm.xml
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
-		<one-to-one name="head" entity-name="Head" foreign-key="BODY_HEAD" cascade="all" lazy="false" constrained="true"/>
+		<one-to-one name="head" entity-name="Head" foreign-key="BODY_HEAD" constrained="true" cascade="all" lazy="false"/>
 	</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" inherit="false">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_h_o_hibernate.hbm.xml
index 1096d3da1..b98ed9862 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_hsqldb_h_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
-		<one-to-one name="head" entity-name="Head" foreign-key="BODY_HEAD" cascade="all" lazy="false" constrained="true"/>
+		<one-to-one name="head" entity-name="Head" foreign-key="BODY_HEAD" constrained="true" cascade="all" lazy="false"/>
 	</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" inherit="false">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_e_o_hibernate.hbm.xml
index 504c187c1..e90ba0088 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_e_o_hibernate.hbm.xml
@@ -43,7 +43,7 @@
 		<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"/>
+		<one-to-one name="person" entity-name="Person" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head"/>
 	</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" inherit="false">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_h_o_hibernate.hbm.xml
index 497d8ac8c..8694d55e8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_h_o_hibernate.hbm.xml
@@ -52,7 +52,7 @@
 		<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"/>
+		<one-to-one name="person" entity-name="Person" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head"/>
 	</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" inherit="false">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_x_o_hibernate.hbm.xml
index c3d80ba64..a8f19d400 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_hsqldb_x_o_hibernate.hbm.xml
@@ -52,7 +52,7 @@
 		<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"/>
+		<one-to-one name="person" entity-name="Person" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="head"/>
 	</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" inherit="false">Person</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_e_o_hibernate.hbm.xml
index 17faace93..d6e5e6e66 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_e_o_hibernate.hbm.xml
@@ -56,7 +56,7 @@
 			<column not-null="false" unique="false" name="`NOTCONTAINEDCHILDNR_NOTCONTAINEDONEWAYNOTREQUIRED_E_ID`"/>
 		</many-to-one>
 		<one-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
-		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main" constrained="true"/>
+		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
 		<one-to-one name="notcontainedtwowaynotrequirednr" entity-name="NotContainedChildNRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl" entity-name="NotContainedChildNR" abstract="false" lazy="false" table="`NOTCONTAINEDCHILDNR`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_h_o_hibernate.hbm.xml
index 9204fe066..e6e99c215 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.relation/Relation1to1Action_hsqldb_h_o_hibernate.hbm.xml
@@ -65,7 +65,7 @@
 			<column not-null="false" unique="false" name="`NOTCONTAINEDCHILDNR_NOTCONTAINEDONEWAYNOTREQUIRED_E_ID`"/>
 		</many-to-one>
 		<one-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
-		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main" constrained="true"/>
+		<one-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" constrained="true" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
 		<one-to-one name="notcontainedtwowaynotrequirednr" entity-name="NotContainedChildNRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" property-ref="main"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl.NotContainedChildNRImpl" entity-name="NotContainedChildNR" abstract="false" lazy="false" discriminator-value="NotContainedChildNR" table="`NOTCONTAINEDCHILDNR`">
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/jpa2/mapsid/model/MapsId.xsd b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/jpa2/mapsid/model/MapsId.xsd
new file mode 100755
index 000000000..0cbf0f9d9
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/jpa2/mapsid/model/MapsId.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsid"
+	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:this="http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsid">
+	
+	<xsd:complexType name="Person">
+		<xsd:sequence>
+			<xsd:element name="name" type="this:Name">
+				<xsd:annotation>
+					<xsd:appinfo source="teneo.jpa">@EmbeddedId</xsd:appinfo>
+				</xsd:annotation>				
+			</xsd:element>
+			<xsd:element name="address" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:appinfo source="teneo.jpa">@Lob</xsd:appinfo>					
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="Name">
+		<xsd:annotation>
+			<xsd:appinfo source="teneo.jpa">@Embeddable</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="firstName" type="xsd:string"/>
+			<xsd:element name="lastName" type="xsd:string"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	
+</xsd:schema>
\ No newline at end of file