Support foreign key composite ids

29 files changed, 4998 insertions, 353 deletions

diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java
index 2a818d867..62914e5ae 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java
@@ -51,6 +51,7 @@ public class FeatureMapper implements ExtensionPoint {
 			PamodelPackage.eINSTANCE.getPAnnotatedEReference_Embedded(),
 			PamodelPackage.eINSTANCE.getPAnnotatedEReference_EmbeddedId(),
 			PamodelPackage.eINSTANCE.getPAnnotatedEReference_ManyToMany(),
+			PamodelPackage.eINSTANCE.getPAnnotatedEStructuralFeature_Id(),
 			PamodelPackage.eINSTANCE.getPAnnotatedEReference_ManyToOne(),
 			PamodelPackage.eINSTANCE.getPAnnotatedEReference_OneToOne() };
 
@@ -184,6 +185,9 @@ public class FeatureMapper implements ExtensionPoint {
 			case PamodelPackage.PANNOTATED_EREFERENCE__EMBEDDED:
 				embeddedMapper.process(pAnnotatedEReference);
 				break;
+			case PamodelPackage.PANNOTATED_EREFERENCE__ID:
+				idMapper.processIdProperty(pAnnotatedEReference);
+				break;
 			case PamodelPackage.PANNOTATED_EREFERENCE__EMBEDDED_ID:
 				idMapper.processEmbeddedId(pAnnotatedEReference);
 				break;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
index d943d5988..fd5ea95da 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
+import org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEAttributeImpl;
 import org.eclipse.emf.teneo.annotations.pannotation.Column;
 import org.eclipse.emf.teneo.annotations.pannotation.GeneratedValue;
 import org.eclipse.emf.teneo.annotations.pannotation.GenerationType;
@@ -256,25 +257,36 @@ public class IdMapper extends AbstractAssociationMapper implements ExtensionPoin
 	/**
 	 * Add property to the mapped id element
 	 */
-	public void processIdProperty(PAnnotatedEAttribute id) {
-		final PAnnotatedEClass aClass = id.getPaEClass();
+	public void processIdProperty(PAnnotatedEStructuralFeature idFeature) {
+		final PAnnotatedEClass aClass = idFeature.getPaEClass();
 		// check precondition
 		if (aClass.getPaSuperEntity() != null && aClass.getPaSuperEntity().hasIdAnnotatedFeature()) {
 			log.error("The annotated eclass: "
 					+ aClass
 					+ " has an id-annotated feature: "
-					+ id
+					+ idFeature
 					+ " while it has a "
 					+ "superclass/type, id properties should always be specified in the top of the inheritance structure");
 			throw new MappingException(
 					"The annotated eclass: "
 							+ aClass
 							+ " has an id-annotated feature: "
-							+ id
+							+ idFeature
 							+ " while it has a "
 							+ "superclass/type, id properties should always be specified in the top of the inheritance structure");
 		}
 
+
+		final Element idElement = getCreateIdElement(getHbmContext().getCurrent(), aClass);
+		final boolean isCompositeId = aClass.getIdClass() != null;
+
+		if (isCompositeId && idFeature instanceof PAnnotatedEReference) {
+			PAnnotatedEReference idReference = (PAnnotatedEReference)idFeature;
+			addKeyManyToOne(idElement, (PAnnotatedEReference) idFeature);
+			return;
+		}
+
+		PAnnotatedEAttribute id = (PAnnotatedEAttribute)idFeature;
 		final EAttribute eAttribute = id.getModelEAttribute();
 		final List<Column> columns = getColumns(id);
 		final GeneratedValue generatedValue = id.getGeneratedValue();
@@ -290,9 +302,6 @@ public class IdMapper extends AbstractAssociationMapper implements ExtensionPoin
 		// throw new MappingException("Unsupported, SecondaryTable", column);
 		// }
 
-		final Element idElement = getCreateIdElement(getHbmContext().getCurrent(), aClass);
-		final boolean isCompositeId = aClass.getIdClass() != null;
-
 		final Element usedIdElement;
 		if (isCompositeId) {
 			usedIdElement = idElement.addElement("key-property");
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java
index 503ebf32f..01b81ea64 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/HbEntityDataStore.java
@@ -274,6 +274,9 @@ public class HbEntityDataStore extends HbDataStore implements EntityManagerFacto
 
 			// TODO replace this
 			final StringBufferInputStream is = new StringBufferInputStream(getMappingXML());
+
+			System.err.println(getMappingXML());
+
 			getConfiguration().addInputStream(is);
 		}
 	}
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/CompositeFKIdAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/CompositeFKIdAction.java
new file mode 100644
index 000000000..49eb8f781
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/CompositeFKIdAction.java
@@ -0,0 +1,79 @@
+/**
+ * <copyright> Copyright (c) 2005, 2006, 2007, 2008 Springsite BV (The Netherlands) and others All rights
+ * reserved. This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html Contributors: Martin Taal </copyright> $Id:
+ * CompositeIdAction.java,v 1.2 2007/02/01 12:35:36 mtaal Exp $
+ */
+
+package org.eclipse.emf.teneo.test.emf.annotations;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidFactory;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID;
+import org.eclipse.emf.teneo.test.AbstractTestAction;
+import org.eclipse.emf.teneo.test.stores.TestStore;
+
+/**
+ * Testcase
+ * 
+ * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
+ * @version $Revision: 1.5 $
+ */
+public class CompositeFKIdAction extends AbstractTestAction {
+	/**
+	 * Constructor
+	 */
+	public CompositeFKIdAction() {
+		super(CompositefkidPackage.eINSTANCE);
+	}
+
+	/** Creates an item, an address and links them to a po. */
+	@Override
+	public void doAction(TestStore store) {
+		final CompositefkidFactory factory = CompositefkidFactory.eINSTANCE;
+		{
+			store.beginTransaction();
+			final Name name1 = factory.createName();
+			name1.setLastName("Smith");
+			store.store(name1);
+
+			final Parent parent = factory.createParent();
+			parent.setFirstName("John");
+			parent.setLastName(name1);
+			final Child child1 = factory.createChild();
+			child1.setFirstName("Johnny");
+			child1.setLastName(name1);
+			parent.getRelations().add(child1);
+			final Child child2 = factory.createChild();
+			child2.setFirstName("Jane");
+			child2.setLastName(name1);
+			parent.getRelations().add(child2);
+			store.store(parent.getRelations());
+			store.store(parent);
+			store.commitTransaction();
+		}
+
+		// read again
+		{
+			store.beginTransaction();
+			final Name name = (Name) store.getObject(Name.class);
+			final Parent parent = (Parent) store.getObject(Parent.class);
+			assertEquals(2, parent.getRelations().size());
+			assertEquals("Johnny", parent.getRelations().get(0).getFirstName());
+			assertEquals("Jane", parent.getRelations().get(1).getFirstName());
+			assertEquals(name, parent.getRelations().get(0).getLastName());
+			assertEquals(name, parent.getRelations().get(1).getLastName());
+			
+			PersonID personId = new PersonID();
+			personId.setFirstName("Johnny");
+			personId.setLastName(name);
+			final Object o = store.getObject("Child", personId);
+			assertEquals(o, parent.getRelations().get(0));
+			store.commitTransaction();
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/.classpath b/tests/org.eclipse.emf.teneo.hibernate.test/.classpath
index 64c5e31b7..3166fcd83 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/.classpath
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="/home/mtaal/mydata/dev/openbravo/projects/pi-core/lib/runtime/postgresql-9.4.1207.jre6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_hsqldb_e_o_hibernate.hbm.xml
new file mode 100644
index 000000000..9c5d112b2
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,212 @@
+<?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.compositefkid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`FIRSTNAME`"/>
+			</key-property>
+			<key-many-to-one name="lastName" entity-name="Name" foreign-key="PERSON_LASTNAME" lazy="false">
+				<column not-null="true" unique="false" name="`LASTNAME`"/>
+			</key-many-to-one>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`PARENT`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<key>
+			<column name="`MYSUPERFIRSTNAME`"/>
+			<column name="`MYSUPERLASTNAME`"/>
+		</key>
+		<list name="relations" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key foreign-key="PARENT_RELATIONS_KEY" update="true">
+				<column name="`MYPARENTFIRSTNAME`" unique="false"/>
+				<column name="`MYPARENTLASTNAME`" unique="false"/>
+			</key>
+			<list-index column="`PARENT_RELATIONS_IDX`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`CHILD`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<key>
+			<column name="`MYSUPERFIRSTNAME`"/>
+			<column name="`MYSUPERLASTNAME`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl" entity-name="Name" abstract="false" lazy="false" table="`NAME`">
+		<meta attribute="eclassName" inherit="false">Name</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LASTNAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" table="`TENEOAUDITCOMMITINFO`">
+		<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`ID`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`VERSION`"/>
+		</version>
+		<property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`USER`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`COMMENT`" length="2000"/>
+		</property>
+		<property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`COMMITTIME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" table="`PERSONAUDITING`">
+		<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PERSONAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_NAME`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FIRSTNAME`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LASTNAME`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`PARENTAUDITING`">
+		<meta attribute="eclassName" inherit="false">ParentAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<key>
+			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+		</key>
+		<list name="relations" table="`PARENTAUDITING_RELATIONSAUDITING`" lazy="true" cascade="all">
+			<key foreign-key="PARENTAUDITING_RELATIONS_KEY" update="true">
+				<column name="`PARENTAUDITING_RELATIONS_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`PARENTAUDITING_RELATIONS_IDX`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`CHILDAUDITING`">
+		<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<key>
+			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NameAuditing" abstract="false" lazy="false" table="`NAMEAUDITING`">
+		<meta attribute="eclassName" inherit="false">NameAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="NAMEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_NAME`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LASTNAME`"/>
+		</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/CompositeFKIdAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_hsqldb_h_o_hibernate.hbm.xml
new file mode 100644
index 000000000..1072fb69a
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,213 @@
+<?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.compositefkid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`FIRSTNAME`"/>
+			</key-property>
+			<key-many-to-one name="lastName" entity-name="Name" foreign-key="PERSON_LASTNAME" lazy="false">
+				<column not-null="true" unique="false" name="`LASTNAME`"/>
+			</key-many-to-one>
+		</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" inherit="false">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" discriminator-value="Parent">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<list name="relations" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key foreign-key="PARENT_RELATIONS_KEY" update="true">
+				<column name="`MYPARENTFIRSTNAME`" unique="false"/>
+				<column name="`MYPARENTLASTNAME`" unique="false"/>
+			</key>
+			<list-index column="`PARENT_RELATIONS_IDX`"/>
+			<one-to-many entity-name="Person"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" discriminator-value="Child">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl" entity-name="Name" abstract="false" lazy="false" discriminator-value="Name" table="`NAME`">
+		<meta attribute="eclassName" inherit="false">Name</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="`DTYPE`" index="NAMEDTYPE" 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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LASTNAME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" discriminator-value="TeneoAuditCommitInfo" table="`TENEOAUDITCOMMITINFO`">
+		<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</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="TENEOAUDITCOMMITINFODTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`VERSION`"/>
+		</version>
+		<property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`USER`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`COMMENT`" length="2000"/>
+		</property>
+		<property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`COMMITTIME`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" discriminator-value="PersonAuditing" table="`PERSONAUDITING`">
+		<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="`DTYPE`" index="PERSONAUDITINGDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PERSONAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_NAME`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`FIRSTNAME`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LASTNAME`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ParentAuditing">
+		<meta attribute="eclassName" inherit="false">ParentAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<list name="relations" table="`PARENTAUDITING_RELATIONSAUDITING`" lazy="true" cascade="all">
+			<key foreign-key="PARENTAUDITING_RELATIONS_KEY" update="true">
+				<column name="`PARENTAUDITING_RELATIONS_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`PARENTAUDITING_RELATIONS_IDX`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ChildAuditing">
+		<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NameAuditing" abstract="false" lazy="false" discriminator-value="NameAuditing" table="`NAMEAUDITING`">
+		<meta attribute="eclassName" inherit="false">NameAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="`DTYPE`" index="NAMEAUDITINGDTYPE" length="255" not-null="true"/>
+		</discriminator>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="NAMEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_NAME`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`LASTNAME`"/>
+		</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/CompositeFKIdAction_pgsql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_pgsql_a_o_hibernate.hbm.xml
new file mode 100644
index 000000000..4e12d70c5
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_pgsql_a_o_hibernate.hbm.xml
@@ -0,0 +1,213 @@
+<?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.compositefkid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-many-to-one name="lastName" entity-name="Name" foreign-key="person_lastname" lazy="false">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-many-to-one>
+		</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" inherit="false">true</meta>
+		</version>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" discriminator-value="Parent">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<list name="children" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key foreign-key="parent_children_key" update="true">
+				<column name="`myparentfirstname`" unique="false"/>
+				<column name="`myparentlastname`" 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.compositefkid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" discriminator-value="Child">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl" entity-name="Name" abstract="false" lazy="false" discriminator-value="Name" table="`name`">
+		<meta attribute="eclassName" inherit="false">Name</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="`dtype`" index="namedtype" 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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" discriminator-value="TeneoAuditCommitInfo" table="`teneoauditcommitinfo`">
+		<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</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="teneoauditcommitinfodtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`user`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`" length="2000"/>
+		</property>
+		<property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`committime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" discriminator-value="PersonAuditing" table="`personauditing`">
+		<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="`dtype`" index="personauditingdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="personauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_feature_name`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ParentAuditing">
+		<meta attribute="eclassName" inherit="false">ParentAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<list name="children" table="`parentauditing_childrenauditing`" lazy="true" cascade="all">
+			<key foreign-key="parentauditing_children_key" update="true">
+				<column name="`parentauditing_children_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`parentauditing_children_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ChildAuditing">
+		<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NameAuditing" abstract="false" lazy="false" discriminator-value="NameAuditing" table="`nameauditing`">
+		<meta attribute="eclassName" inherit="false">NameAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator type="string">
+			<column name="`dtype`" index="nameauditingdtype" length="255" not-null="true"/>
+		</discriminator>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="nameauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_feature_name`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</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/CompositeFKIdAction_pgsql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_pgsql_s_o_hibernate.hbm.xml
new file mode 100644
index 000000000..97b38c1b6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeFKIdAction_pgsql_s_o_hibernate.hbm.xml
@@ -0,0 +1,212 @@
+<?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.compositefkid.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
+		<meta attribute="eclassName" inherit="false">Person</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID" mapped="true">
+			<key-property name="firstName" type="java.lang.String">
+				<column not-null="true" unique="false" name="`firstname`"/>
+			</key-property>
+			<key-many-to-one name="lastName" entity-name="Name" foreign-key="person_lastname" lazy="false">
+				<column not-null="true" unique="false" name="`lastname`"/>
+			</key-many-to-one>
+		</composite-id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion" inherit="false">true</meta>
+		</version>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl" entity-name="Parent" abstract="false" lazy="false" extends="Person" table="`parent`">
+		<meta attribute="eclassName" inherit="false">Parent</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<key>
+			<column name="`mysuperfirstname`"/>
+			<column name="`mysuperlastname`"/>
+		</key>
+		<list name="children" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+			<key foreign-key="parent_children_key" update="true">
+				<column name="`myparentfirstname`" unique="false"/>
+				<column name="`myparentlastname`" 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.compositefkid.impl.ChildImpl" entity-name="Child" abstract="false" lazy="false" extends="Person" table="`child`">
+		<meta attribute="eclassName" inherit="false">Child</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<key>
+			<column name="`mysuperfirstname`"/>
+			<column name="`mysuperlastname`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl" entity-name="Name" abstract="false" lazy="false" table="`name`">
+		<meta attribute="eclassName" inherit="false">Name</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecore</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId" inherit="false">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" inherit="false">true</meta>
+		</version>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" table="`teneoauditcommitinfo`">
+		<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
+		<id name="id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="version" type="long">
+			<column not-null="true" unique="false" name="`version`"/>
+		</version>
+		<property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`user`"/>
+		</property>
+		<property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`comment`" length="2000"/>
+		</property>
+		<property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`committime`"/>
+		</property>
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" table="`personauditing`">
+		<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="personauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_feature_name`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`firstname`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`parentauditing`">
+		<meta attribute="eclassName" inherit="false">ParentAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<key>
+			<column name="`personauditing_teneo_audit_id`"/>
+		</key>
+		<list name="children" table="`parentauditing_childrenauditing`" lazy="true" cascade="all">
+			<key foreign-key="parentauditing_children_key" update="true">
+				<column name="`parentauditing_children_teneo_audit_id`" unique="false"/>
+			</key>
+			<list-index column="`parentauditing_children_idx`"/>
+			<element type="java.lang.String"/>
+		</list>
+	</joined-subclass>
+	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`childauditing`">
+		<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<key>
+			<column name="`personauditing_teneo_audit_id`"/>
+		</key>
+	</joined-subclass>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NameAuditing" abstract="false" lazy="false" table="`nameauditing`">
+		<meta attribute="eclassName" inherit="false">NameAuditing</meta>
+		<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositefkid.ecoreAuditing</meta>
+		<id name="teneo_audit_id" type="long" unsaved-value="0">
+			<column not-null="true" unique="false" name="`teneo_audit_id`"/>
+			<generator class="native"/>
+		</id>
+		<version name="teneo_version" type="long">
+			<column not-null="true" unique="false" name="`teneo_version`"/>
+		</version>
+		<property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_object_id`" unique-key="c0,c1,c2"/>
+		</property>
+		<property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_owner_object_id`"/>
+		</property>
+		<property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_start`" unique-key="c0"/>
+		</property>
+		<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_end`" unique-key="c1"/>
+		</property>
+		<many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="nameauditing_teneo_commit_info" insert="true" update="true" not-null="true">
+			<column not-null="true" unique="false" name="`teneoauditcommitinfo_teneo_commit_info_id`"/>
+		</many-to-one>
+		<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
+			<column not-null="true" unique="false" name="`teneo_audit_kind`"/>
+			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+				<param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+				<param name="eclassifier">TeneoAuditKind</param>
+				<param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+			</type>
+		</property>
+		<property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_id`"/>
+		</property>
+		<property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+			<column not-null="false" unique="false" name="`teneo_container_feature_id`"/>
+		</property>
+		<property name="teneo_container_feature_name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_container_feature_name`"/>
+		</property>
+		<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_previous_start`" unique-key="c2"/>
+		</property>
+		<property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`teneo_object_version`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`teneo_resourceid`"/>
+		</property>
+		<property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`lastname`"/>
+		</property>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/hudson_test.properties b/tests/org.eclipse.emf.teneo.hibernate.test/src/hudson_test.properties
index ccf513c94..df8dea1d6 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/hudson_test.properties
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/hudson_test.properties
@@ -40,13 +40,13 @@ hsqldb_e_o.dbadapter=hsqldbmem
 hsqldb_e_o.mapstrategy=JOINED
 hsqldb_e_o.optimistic=true
 
-#pgsql_a_o.dbadapter=pgsql
-#pgsql_a_o.mapstrategy=SINGLE_TABLE
-#pgsql_a_o.optimistic=true
+pgsql_a_o.dbadapter=pgsql
+pgsql_a_o.mapstrategy=SINGLE_TABLE
+pgsql_a_o.optimistic=true
 
-#pgsql_s_o.dbadapter=pgsql
-#pgsql_s_o.mapstrategy=JOINED
-#pgsql_s_o.optimistic=true
+pgsql_s_o.dbadapter=pgsql
+pgsql_s_o.mapstrategy=JOINED
+pgsql_s_o.optimistic=true
 
 #mssql_a_o.dbadapter=mcssql
 #mssql_a_o.mapstrategy=SINGLE_TABLE
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java
index d2b1abbaf..4b0d5df31 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java
@@ -8,9 +8,6 @@
 
 package org.eclipse.emf.teneo.hibernate.test.emf.annotations;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.emf.teneo.hibernate.test.HibernateTestbed;
 import org.eclipse.emf.teneo.test.conf.MultiCfgTestSuite;
 import org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction;
@@ -18,6 +15,7 @@ import org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction;
 import org.eclipse.emf.teneo.test.emf.annotations.BasicAction;
 import org.eclipse.emf.teneo.test.emf.annotations.BookAction;
 import org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction;
+import org.eclipse.emf.teneo.test.emf.annotations.CompositeFKIdAction;
 import org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction;
 import org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction;
 import org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction;
@@ -49,6 +47,9 @@ import org.eclipse.emf.teneo.test.emf.annotations.TransientAction;
 import org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction;
 import org.eclipse.emf.teneo.test.emf.annotations.VariousAction;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * All tests
  * 
@@ -59,8 +60,10 @@ public class AllTests {
 
 	public static Test suite() {
 		TestSuite suite = new MultiCfgTestSuite(
-				"Test for org.eclipse.emf.teneo.hibernate.test.emf.annotations", HibernateTestbed
-						.instance().getConfigurations());
+				"Test for org.eclipse.emf.teneo.hibernate.test.emf.annotations",
+				HibernateTestbed.instance().getConfigurations());
+
+		suite.addTestSuite(CompositeFKIdAction.class);
 		suite.addTestSuite(IdAction.class);
 		suite.addTestSuite(UserTypeAction.class);
 		suite.addTestSuite(ExternalAction.class);
diff --git a/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
index 05b8773e7..af34e652c 100755
--- a/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.emf.teneo.samples;singleton:=true
 Bundle-Version: 1.1.2.qualifier
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.7.0",
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
@@ -13,28 +13,94 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.7.0",
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: dependent
 Bundle-Vendor: %Plugin.providerName
-Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- com.example.car.impl;uses:="org.eclipse.emf.ecore.impl,  com.example.car,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+Export-Package: com.example.car;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ com.example.car.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   com.example.car,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  com.example.car.model,
- com.example.car.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  com.example.car,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- com.example.car.validation;uses:="com.example.car,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
+ com.example.car.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   com.example.car,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ com.example.car.validation;
+  uses:="com.example.car,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test,
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.impl,
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.util,
  com.ibm.websphere.appserver.schemas._6._0.ibm.portal.test.validation,
- extlibrary;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- extlibrary.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  extlibrary,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ extlibrary;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ extlibrary.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   extlibrary,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  extlibrary.model,
- extlibrary.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  extlibrary,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ extlibrary.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   extlibrary,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  fleet,
  fleet.impl,
  fleet.util,
- lobj;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- lobj.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  lobj,  org.eclipse.emf.ecore",
- lobj.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore,  lobj",
- main;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- main.impl;uses:="main,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
- main.util;uses:="org.eclipse.emf.common.notify.impl,  main,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ lobj;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ lobj.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   lobj,
+   org.eclipse.emf.ecore",
+ lobj.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore,
+   lobj",
+ main;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ main.impl;
+  uses:="main,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ main.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   main,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
  org.eclipse.bpmn2,
  org.eclipse.bpmn2.di,
  org.eclipse.bpmn2.di.impl,
@@ -47,95 +113,315 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.dd.di,
  org.eclipse.dd.di.impl,
  org.eclipse.dd.di.util,
- org.eclipse.emf.teneo.rental;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.rental.impl;uses:="org.eclipse.emf.teneo.rental,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.rental;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.rental.impl;
+  uses:="org.eclipse.emf.teneo.rental,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.rental.model,
- org.eclipse.emf.teneo.rental.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.rental,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.rental.validation;uses:="org.eclipse.emf.teneo.rental,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples;uses:=org.eclipse.emf.ecore,
+ org.eclipse.emf.teneo.rental.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.rental,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.rental.validation;
+  uses:="org.eclipse.emf.teneo.rental,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples;
+  uses:="org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.any,
  org.eclipse.emf.teneo.samples.emf.annotations.any.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.any.util,
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.model,
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.associationoverride,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.associationoverride.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.associationoverride",
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.model,
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.attributeoverrides",
  org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable,
  org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.util,
- org.eclipse.emf.teneo.samples.emf.annotations.basic;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.basic.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.basic,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.basic;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.basic.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.basic,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.basic.model,
- org.eclipse.emf.teneo.samples.emf.annotations.basic.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.basic,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.basic.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.basic,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.basic.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.model,
- org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.column;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.column.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.column;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.column.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.column.model,
- org.eclipse.emf.teneo.samples.emf.annotations.column.util;uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.column.util;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.column,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.column.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.annotations.compositeid",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.teneo.samples.emf.annotations.compositeid",
  org.eclipse.emf.teneo.samples.emf.annotations.compositeid.model,
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.compositeid,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.compositeid.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.duplicates,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.compositeid,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.compositeid.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.duplicates,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.duplicates.model,
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.annotations.duplicates,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.duplicates.validation;uses:=org.eclipse.emf.common.util,
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.duplicates,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.duplicates.validation;
+  uses:="org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.util,
  org.eclipse.emf.teneo.samples.emf.annotations.eavlibrary.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.model,
- org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.embedded;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.embedded,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embedded;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.embedded,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.embedded.model,
- org.eclipse.emf.teneo.samples.emf.annotations.embedded.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.embedded,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.embedded.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.embedded,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embedded.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.embedded,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.embedded.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.embedded,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.model,
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,
- org.eclipse.emf.teneo.samples.emf.annotations.entity;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.entity.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore,org.eclipse.emf.teneo.samples.emf.annotations.entity",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.embeddedid,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid",
+ org.eclipse.emf.teneo.samples.emf.annotations.entity;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.entity.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.teneo.samples.emf.annotations.entity",
  org.eclipse.emf.teneo.samples.emf.annotations.entity.model,
- org.eclipse.emf.teneo.samples.emf.annotations.entity.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.annotations.entity",
+ org.eclipse.emf.teneo.samples.emf.annotations.entity.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.teneo.samples.emf.annotations.entity",
  org.eclipse.emf.teneo.samples.emf.annotations.entity.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.external,
  org.eclipse.emf.teneo.samples.emf.annotations.external.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.external.util,
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.extralazy,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.extralazy,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.extralazy.model,
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.extralazy,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.extralazy.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.extralazy,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.extralazy.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.model,
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.forcedidbag.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.model,
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.validation;uses:=javax.xml.datatype,
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.validation;
+  uses:="javax.xml.datatype",
  org.eclipse.emf.teneo.samples.emf.annotations.hbcascade,
  org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.hbcascade.util,
@@ -145,124 +431,464 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.emf.annotations.hibernate,
  org.eclipse.emf.teneo.samples.emf.annotations.hibernate.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.hibernate.util,
- org.eclipse.emf.teneo.samples.emf.annotations.id;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.id.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.id,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.id;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.id.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.id,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.id.model,
- org.eclipse.emf.teneo.samples.emf.annotations.id.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.id,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.id.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.id,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.id.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.idbag;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.idbag,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.idbag,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.idbag.model,
- org.eclipse.emf.teneo.samples.emf.annotations.idbag.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.teneo.samples.emf.annotations.idbag,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.idbag.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.teneo.samples.emf.annotations.idbag,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.idbag.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.model,
- org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping",
+ org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping",
  org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator,
  org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.integerdiscriminator.util,
- org.eclipse.emf.teneo.samples.emf.annotations.joincolumns;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.joincolumns;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.model,
- org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.lazy;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.lazy,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.lazy;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.lazy,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.lazy.model,
- org.eclipse.emf.teneo.samples.emf.annotations.lazy.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.lazy,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.lazy.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.annotations.lazy",
- org.eclipse.emf.teneo.samples.emf.annotations.lob;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.lob,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lazy.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.lazy,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.lazy.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.lazy",
+ org.eclipse.emf.teneo.samples.emf.annotations.lob;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lob.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.lob,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.lob.model,
- org.eclipse.emf.teneo.samples.emf.annotations.lob.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.lob,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.lob.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.lob,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.lob.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.manytomany,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.manytomany,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.manytomany.model,
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.manytomany,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.manytomany.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.annotations.mapkey;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.manytomany,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.manytomany.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.mapkey;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mapkey.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.mapkey.model,
- org.eclipse.emf.teneo.samples.emf.annotations.mapkey.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.mapkey,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.mapkey.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mapkey.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.mapkey,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mapkey.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.mapkey,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.model,
- org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.validation,
  org.eclipse.emf.teneo.samples.emf.annotations.naturalId,
  org.eclipse.emf.teneo.samples.emf.annotations.naturalId.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.naturalId.util,
- org.eclipse.emf.teneo.samples.emf.annotations.nmset;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.nmset,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.nmset,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.nmset.model,
- org.eclipse.emf.teneo.samples.emf.annotations.nmset.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.nmset,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.nmset.validation;uses:=org.eclipse.emf.common.util,
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.nmset,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.nmset.validation;
+  uses:="org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.annotations.otopk,
  org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.otopk.util,
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.model,
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytable;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytable;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.model,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.secondarytable,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.model,
- org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.annotations.secondarytablehibernate.validation,
- org.eclipse.emf.teneo.samples.emf.annotations.set;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.set.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.set,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.set;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.set.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.set,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.set.model,
- org.eclipse.emf.teneo.samples.emf.annotations.set.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.set,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.set.validation;uses:="org.eclipse.emf.teneo.samples.emf.annotations.set,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.annotations.toone;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.toone.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.toone,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.set.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.set,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.set.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.set,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.toone,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.toone.model,
- org.eclipse.emf.teneo.samples.emf.annotations.toone.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.annotations.toone,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.toone.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.toone,
- org.eclipse.emf.teneo.samples.emf.annotations.transent;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.transent.impl;uses:="org.eclipse.emf.teneo.samples.emf.annotations.transent,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.annotations.toone,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.toone.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.toone",
+ org.eclipse.emf.teneo.samples.emf.annotations.transent;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.transent.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.transent,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.transent.model,
- org.eclipse.emf.teneo.samples.emf.annotations.transent.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.annotations.transent,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.annotations.transent.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.transent,
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.transent.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.teneo.samples.emf.annotations.transent,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.transent.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.transent",
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.model,
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.validation;uses:=org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints",
  org.eclipse.emf.teneo.samples.emf.annotations.various,
  org.eclipse.emf.teneo.samples.emf.annotations.various.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.various.util,
- org.eclipse.emf.teneo.samples.emf.detach.detachelist;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachelist,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.detach.detachelist,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachelist.model,
- org.eclipse.emf.teneo.samples.emf.detach.detachelist.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachelist,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.detach.detachelist.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.detach.detachelist,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.detach.detachelist.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.model,
  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.presentation,
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.provider;uses:="org.eclipse.emf.common,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.edit.provider,  org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachtest;uses:="org.eclipse.emf.common.util,javax.xml.datatype,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl;uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.provider;
+  uses:="org.eclipse.emf.common,
+   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.edit.provider,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.detach.detachfeaturemap,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest;
+  uses:="org.eclipse.emf.common.util,
+   javax.xml.datatype,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   javax.xml.datatype,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.detach.detachtest.model,
- org.eclipse.emf.teneo.samples.emf.detach.detachtest.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.detach.detachtest,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.detach.detachtest.validation;uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,  org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.elist.featuremap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.elist.featuremap,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.detach.detachtest,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.detach.detachtest.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.detach.detachtest,
+   org.eclipse.emf.common.util,
+   javax.xml.datatype,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.elist.featuremap;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.elist.featuremap.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.elist.featuremap,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.elist.featuremap.model,
- org.eclipse.emf.teneo.samples.emf.elist.featuremap.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.elist.featuremap,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.elist.featuremap.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.elist.featuremap,org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.elist.featuremap.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.elist.featuremap,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.elist.featuremap.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.elist.featuremap,
+   org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.jpa2.associationoverride,
  org.eclipse.emf.teneo.samples.emf.jpa2.associationoverride.impl,
  org.eclipse.emf.teneo.samples.emf.jpa2.associationoverride.util,
@@ -284,115 +910,485 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.emf.jpa2.orphanremoval,
  org.eclipse.emf.teneo.samples.emf.jpa2.orphanremoval.impl,
  org.eclipse.emf.teneo.samples.emf.jpa2.orphanremoval.util,
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.relation.relation1to1,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.relation.relation1to1,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relation1to1.model,
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.relation.relation1to1,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relation1to1.validation;uses:="org.eclipse.emf.teneo.samples.emf.relation.relation1to1",
- org.eclipse.emf.teneo.samples.emf.relation.relation1ton;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.relation.relation1ton,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.relation.relation1to1,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1to1.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.relation.relation1to1",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1ton;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1ton.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.relation.relation1ton,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relation1ton.model,
- org.eclipse.emf.teneo.samples.emf.relation.relation1ton.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.relation.relation1ton,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.relation.relation1ton.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.relation.relation1ton",
- org.eclipse.emf.teneo.samples.emf.relation.relationntom;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.relation.relationntom,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1ton.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.relation.relation1ton,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.relation.relation1ton.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.relation.relation1ton",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.relation.relationntom,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.relation.relationntom.model,
- org.eclipse.emf.teneo.samples.emf.relation.relationntom.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.relation.relationntom,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.relation.relationntom.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.sample.accounting;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.accounting.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.accounting,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.relation.relationntom,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.relation.relationntom.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.sample.accounting;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.accounting.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.accounting,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.accounting.model,
- org.eclipse.emf.teneo.samples.emf.sample.accounting.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.sample.accounting,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.sample.accounting.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.accounting,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.sample.capa;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.capa.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.capa,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.accounting.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.teneo.samples.emf.sample.accounting,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.sample.accounting.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.accounting,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.sample.capa;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.capa.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.capa,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.capa.model,
- org.eclipse.emf.teneo.samples.emf.sample.capa.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.capa,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.catalog;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.catalog.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.catalog,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.capa.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.capa,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.catalog;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.catalog.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.catalog,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.catalog.model,
- org.eclipse.emf.teneo.samples.emf.sample.catalog.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.sample.catalog,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.catalog.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.catalog,org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.sample.catalog.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.catalog,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.catalog.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.catalog,
+   org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.claim,
  org.eclipse.emf.teneo.samples.emf.sample.claim.impl,
  org.eclipse.emf.teneo.samples.emf.sample.claim.model,
  org.eclipse.emf.teneo.samples.emf.sample.claim.util,
  org.eclipse.emf.teneo.samples.emf.sample.claim.validation,
- org.eclipse.emf.teneo.samples.emf.sample.dynamic;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl;uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.dynamic;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.dynamic.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.dynamic.model,
- org.eclipse.emf.teneo.samples.emf.sample.dynamic.util;uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.dynamic.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.sample.dynamic.util;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.dynamic,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.dynamic.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.sample.employee,
  org.eclipse.emf.teneo.samples.emf.sample.employee.impl,
  org.eclipse.emf.teneo.samples.emf.sample.employee.model,
  org.eclipse.emf.teneo.samples.emf.sample.employee.util,
  org.eclipse.emf.teneo.samples.emf.sample.employee.validation,
- org.eclipse.emf.teneo.samples.emf.sample.epo2;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.epo2.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.epo2,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.epo2;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.epo2.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.epo2,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.epo2.model,
- org.eclipse.emf.teneo.samples.emf.sample.epo2.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.epo2,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.epo2.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.epo2,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.sample.forum;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.forum.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.forum,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.epo2.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.epo2,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.epo2.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.epo2,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.sample.forum;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.forum.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.forum,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.forum.model,
- org.eclipse.emf.teneo.samples.emf.sample.forum.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.forum,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.forum.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.forum,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.sample.inv;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.inv.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.inv,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.forum.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.forum,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.forum.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.forum,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.sample.inv;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.inv.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.inv,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.inv.model,
- org.eclipse.emf.teneo.samples.emf.sample.inv.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.inv,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.library;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.library.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.library,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.inv.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.inv,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.library;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.library.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.library,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.library.model,
- org.eclipse.emf.teneo.samples.emf.sample.library.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.library,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.library.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.sample.library",
- org.eclipse.emf.teneo.samples.emf.sample.play;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.library.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.library,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.library.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.library",
+ org.eclipse.emf.teneo.samples.emf.sample.play;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.play.data,
- org.eclipse.emf.teneo.samples.emf.sample.play.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.play,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.play.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.play,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.play.model,
- org.eclipse.emf.teneo.samples.emf.sample.play.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.teneo.samples.emf.sample.play,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.play.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.play,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.sample.product;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.product.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.product,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.play.util;
+  uses:="org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.teneo.samples.emf.sample.play,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.play.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.play,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.sample.product;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.product.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.product,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.product.model,
- org.eclipse.emf.teneo.samples.emf.sample.product.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.product,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.sample.product.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.sample.product,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo;uses:="org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,  javax.xml.datatype,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.product.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.product,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.sample.product.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.product,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo;
+  uses:="org.eclipse.emf.common.util,
+   javax.xml.datatype,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,
+   javax.xml.datatype,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.model,
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,  org.eclipse.emf.common.util,  javax.xml.datatype,  org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl;uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.util;
+  uses:="org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.schemaprimerpo,
+   org.eclipse.emf.common.util,
+   javax.xml.datatype,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
+   org.eclipse.emf.common.util",
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.model,
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary;uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.schoollibrary.validation,
- org.eclipse.emf.teneo.samples.emf.sample.sunBooks;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl;uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.sunBooks;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.sunBooks.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.sunBooks.model,
- org.eclipse.emf.teneo.samples.emf.sample.sunBooks.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.emf.sample.sunBooks,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.sunBooks.validation;uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.sample.workflow;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.sample.workflow.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.sample.workflow,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.sunBooks.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.emf.sample.sunBooks,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.sunBooks.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.sample.sunBooks,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.sample.workflow;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.sample.workflow.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.sample.workflow,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.sample.workflow.model,
- org.eclipse.emf.teneo.samples.emf.sample.workflow.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.sample.workflow,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.validation;uses:="org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.sample.workflow.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.sample.workflow,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.attributes,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.datetime,
+   org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.impl,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.documentroot.util,
@@ -401,69 +1397,347 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.impl,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.util,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.duration.validation,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs;uses:="org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs;
+  uses:="org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.ecoreattrs,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.model,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.list;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.util;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,  org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.util;
+  uses:="org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.groupall,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.list;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.util;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.list,
+   org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.list.validation,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.validation;uses:=org.eclipse.emf.common.util,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.util;
+  uses:="org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.listunion.validation;
+  uses:="org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.mixed,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.model,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.impl,
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.modelgroup.util,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname;uses:="javax.xml.namespace,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,  javax.xml.namespace,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.validation;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,  javax.xml.namespace,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.nestedgroup,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname;
+  uses:="javax.xml.namespace,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,
+   javax.xml.namespace,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname.validation;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.qname,
+   javax.xml.namespace,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.restriction.validation,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.model,
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.validation;uses:="org.eclipse.emf.common.util,org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.util;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,  org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl;uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.util;uses:="org.eclipse.emf.ecore.xml.type.util,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.abstractreference;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.abstractreference.impl;uses:="org.eclipse.emf.teneo.samples.issues.abstractreference,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simplefeaturemap,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.util;
+  uses:="org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.validation;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.util;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution,
+   org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl;
+  uses:="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.util;
+  uses:="org.eclipse.emf.ecore.xml.type.util,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.abstractreference;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.abstractreference.impl;
+  uses:="org.eclipse.emf.teneo.samples.issues.abstractreference,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.abstractreference.model,
- org.eclipse.emf.teneo.samples.issues.abstractreference.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.issues.abstractreference,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.abstractreference.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.issues.abstractreference,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.abstractsuper,
  org.eclipse.emf.teneo.samples.issues.abstractsuper.impl,
  org.eclipse.emf.teneo.samples.issues.abstractsuper.model,
@@ -472,10 +1746,25 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.issues.adept,
  org.eclipse.emf.teneo.samples.issues.adept.impl,
  org.eclipse.emf.teneo.samples.issues.adept.util,
- org.eclipse.emf.teneo.samples.issues.bagduplicate;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.bagduplicate.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.bagduplicate,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.bagduplicate;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.bagduplicate.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.issues.bagduplicate,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.bagduplicate.model,
- org.eclipse.emf.teneo.samples.issues.bagduplicate.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.issues.bagduplicate,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.bagduplicate.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.issues.bagduplicate,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.bz224991,
  org.eclipse.emf.teneo.samples.issues.bz224991.impl,
  org.eclipse.emf.teneo.samples.issues.bz224991.model,
@@ -603,33 +1892,103 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.issues.bz401710,
  org.eclipse.emf.teneo.samples.issues.bz401710.impl,
  org.eclipse.emf.teneo.samples.issues.bz401710.util,
- org.eclipse.emf.teneo.samples.issues.enumtest;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.enumtest.impl;uses:="org.eclipse.emf.teneo.samples.issues.enumtest,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.enumtest;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.enumtest.impl;
+  uses:="org.eclipse.emf.teneo.samples.issues.enumtest,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.enumtest.model,
- org.eclipse.emf.teneo.samples.issues.enumtest.util;uses:="org.eclipse.emf.teneo.samples.issues.enumtest,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.issues.generaltest;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.generaltest.impl;uses:="org.eclipse.emf.teneo.samples.issues.generaltest,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.enumtest.util;
+  uses:="org.eclipse.emf.teneo.samples.issues.enumtest,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.generaltest;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.generaltest.impl;
+  uses:="org.eclipse.emf.teneo.samples.issues.generaltest,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.generaltest.model,
- org.eclipse.emf.teneo.samples.issues.generaltest.util;uses:="org.eclipse.emf.teneo.samples.issues.generaltest,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.generaltest.validation;uses:="org.eclipse.emf.teneo.samples.issues.generaltest,org.eclipse.emf.common.util",
- org.eclipse.emf.teneo.samples.issues.inheritance;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.inheritance.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.inheritance,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.generaltest.util;
+  uses:="org.eclipse.emf.teneo.samples.issues.generaltest,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.generaltest.validation;
+  uses:="org.eclipse.emf.teneo.samples.issues.generaltest,
+   org.eclipse.emf.common.util",
+ org.eclipse.emf.teneo.samples.issues.inheritance;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.inheritance.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.issues.inheritance,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.inheritance.model,
- org.eclipse.emf.teneo.samples.issues.inheritance.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.issues.inheritance,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.issues.interfacetrue;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.issues.interfacetrue.impl;uses:="org.eclipse.emf.ecore.impl,org.eclipse.emf.teneo.samples.issues.interfacetrue,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.inheritance.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.issues.inheritance,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.interfacetrue;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.interfacetrue.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.issues.interfacetrue,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.interfacetrue.model,
- org.eclipse.emf.teneo.samples.issues.interfacetrue.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.teneo.samples.issues.interfacetrue,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.interfacetrue.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.teneo.samples.issues.interfacetrue,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.largemapvalue,
  org.eclipse.emf.teneo.samples.issues.largemapvalue.impl,
  org.eclipse.emf.teneo.samples.issues.largemapvalue.model,
  org.eclipse.emf.teneo.samples.issues.largemapvalue.util,
  org.eclipse.emf.teneo.samples.issues.library,
  org.eclipse.emf.teneo.samples.issues.library.util,
- org.eclipse.emf.teneo.samples.issues.mtmsame;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.mtmsame.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.mtmsame,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.mtmsame;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.mtmsame.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.issues.mtmsame,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.mtmsame.model,
- org.eclipse.emf.teneo.samples.issues.mtmsame.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.mtmsame,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.mtmsame.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.issues.mtmsame,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.nav,
  org.eclipse.emf.teneo.samples.issues.nav.impl,
  org.eclipse.emf.teneo.samples.issues.nav.util,
@@ -641,14 +2000,42 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.issues.nonmandatoryjoincolumn,
  org.eclipse.emf.teneo.samples.issues.nonmandatoryjoincolumn.impl,
  org.eclipse.emf.teneo.samples.issues.nonmandatoryjoincolumn.util,
- org.eclipse.emf.teneo.samples.issues.refresh;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.refresh.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.refresh,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.refresh;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.refresh.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.issues.refresh,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.refresh.model,
- org.eclipse.emf.teneo.samples.issues.refresh.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.teneo.samples.issues.refresh,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- org.eclipse.emf.teneo.samples.issues.resource;uses:=org.eclipse.emf.ecore,
- org.eclipse.emf.teneo.samples.issues.resource.impl;uses:="org.eclipse.emf.teneo.samples.issues.resource,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.refresh.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.teneo.samples.issues.refresh,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.resource;
+  uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.resource.impl;
+  uses:="org.eclipse.emf.teneo.samples.issues.resource,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.resource.model,
- org.eclipse.emf.teneo.samples.issues.resource.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.issues.resource,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.resource.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.issues.resource,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.resourceunload,
  org.eclipse.emf.teneo.samples.issues.resourceunload.impl,
  org.eclipse.emf.teneo.samples.issues.resourceunload.model,
@@ -659,26 +2046,83 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.emf.teneo.samples.issues.simplearray,
  org.eclipse.emf.teneo.samples.issues.simplearray.impl,
  org.eclipse.emf.teneo.samples.issues.simplearray.util,
- org.eclipse.emf.teneo.samples.issues.simplenm;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.simplenm.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.simplenm,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.simplenm;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.simplenm.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.issues.simplenm,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.simplenm.model,
- org.eclipse.emf.teneo.samples.issues.simplenm.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.teneo.samples.issues.simplenm,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ org.eclipse.emf.teneo.samples.issues.simplenm.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.teneo.samples.issues.simplenm,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  org.eclipse.emf.teneo.samples.issues.top,
  org.eclipse.emf.teneo.samples.issues.top.impl,
  org.eclipse.emf.teneo.samples.issues.top.util,
  org.eclipse.emf.teneo.samples.issues.top.validation,
- org.eclipse.emf.teneo.samples.issues.topclasses;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.topclasses.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.teneo.samples.issues.topclasses,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.topclasses;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.topclasses.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.teneo.samples.issues.topclasses,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.topclasses.model,
- org.eclipse.emf.teneo.samples.issues.topclasses.util;uses:="org.eclipse.emf.common.notify.impl,  org.eclipse.emf.teneo.samples.issues.topclasses,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.transientsuper;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.transientsuper.impl;uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.topclasses.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.teneo.samples.issues.topclasses,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.transientsuper;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.transientsuper.impl;
+  uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.transientsuper.model,
- org.eclipse.emf.teneo.samples.issues.transientsuper.util;uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.update;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- org.eclipse.emf.teneo.samples.issues.update.impl;uses:="org.eclipse.emf.teneo.samples.issues.update,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.transientsuper.util;
+  uses:="org.eclipse.emf.teneo.samples.issues.transientsuper,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.update;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.update.impl;
+  uses:="org.eclipse.emf.teneo.samples.issues.update,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.teneo.samples.issues.update.model,
- org.eclipse.emf.teneo.samples.issues.update.util;uses:="org.eclipse.emf.teneo.samples.issues.update,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.eclipse.emf.teneo.samples.issues.update.util;
+  uses:="org.eclipse.emf.teneo.samples.issues.update,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.eclipse.emf.test.databinding.emfdb,
  org.eclipse.emf.test.databinding.emfdb.impl,
  org.eclipse.emf.test.databinding.emfdb.util,
@@ -688,29 +2132,99 @@ Export-Package: com.example.car;uses:="org.eclipse.emf.common.util,org.eclipse.e
  org.eclipse.example.library.model,
  org.eclipse.example.library.util,
  org.eclipse.example.library.validation,
- org.example.mindmap;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- org.example.mindmap.impl;uses:="org.example.mindmap,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
+ org.example.mindmap;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ org.example.mindmap.impl;
+  uses:="org.example.mindmap,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
  org.example.mindmap.model,
- org.example.mindmap.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.example.mindmap,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.resource,  org.eclipse.emf.ecore",
+ org.example.mindmap.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.example.mindmap,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource,
+   org.eclipse.emf.ecore",
  org.w3._2000._09.xmldsig,
  org.w3._2000._09.xmldsig.impl,
  org.w3._2000._09.xmldsig.util,
- tc.apple;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.util,org.eclipse.emf.ecore",
- tc.apple.impl;uses:="org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  tc.apple,  org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore",
- tc.apple.util;uses:="org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  tc.apple,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
- tc.apple.validation;uses:="org.eclipse.emf.common.util,tc.apple,org.eclipse.emf.ecore.util",
- tc.tree;uses:=org.eclipse.emf.ecore,
- tc.tree.impl;uses:="tc.tree,org.eclipse.emf.ecore.impl,org.eclipse.emf.ecore",
- tc.tree.util;uses:="org.eclipse.emf.common.notify.impl,  tc.tree,  org.eclipse.emf.ecore.xmi.util,  org.eclipse.emf.ecore.resource.impl,  org.eclipse.emf.ecore.xmi.impl,  org.eclipse.emf.common.notify,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore,  org.eclipse.emf.ecore.resource",
+ tc.apple;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ tc.apple.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   tc.apple,
+   org.eclipse.emf.ecore.util,
+   org.eclipse.emf.ecore",
+ tc.apple.util;
+  uses:="org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   tc.apple,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
+ tc.apple.validation;
+  uses:="org.eclipse.emf.common.util,
+   tc.apple,
+   org.eclipse.emf.ecore.util",
+ tc.tree;
+  uses:="org.eclipse.emf.ecore",
+ tc.tree.impl;
+  uses:="tc.tree,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.ecore",
+ tc.tree.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   tc.tree,
+   org.eclipse.emf.ecore.xmi.util,
+   org.eclipse.emf.ecore.resource.impl,
+   org.eclipse.emf.ecore.xmi.impl,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.resource",
  tc.tree.validation,
  temporal,
  temporal.impl,
  temporal.mod,
  temporal.util,
- testinheritance;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore",
- testinheritance.impl;uses:="org.eclipse.emf.ecore.impl,  testinheritance,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore",
+ testinheritance;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
+ testinheritance.impl;
+  uses:="org.eclipse.emf.ecore.impl,
+   testinheritance,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore",
  testinheritance.model,
- testinheritance.util;uses:="org.eclipse.emf.common.notify.impl,  testinheritance,  org.eclipse.emf.common.notify,  org.eclipse.emf.ecore",
- testinheritance.validation;uses:="testinheritance,org.eclipse.emf.common.util"
+ testinheritance.util;
+  uses:="org.eclipse.emf.common.notify.impl,
+   testinheritance,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore",
+ testinheritance.validation;
+  uses:="testinheritance,
+   org.eclipse.emf.common.util",
+ compositefkid,
+ compositefkid.impl,
+ compositefkid.util,
+ org.eclipse.emf.teneo.samples.emf.annotations.compositefkid,
+ org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl,
+ org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.util
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Child.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Child.java
new file mode 100644
index 000000000..f649f2a5e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Child.java
@@ -0,0 +1,17 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Child</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getChild()
+ * @model annotation="teneo.jpa appinfo='@PrimaryKeyJoinColumns({\n\t@PrimaryKeyJoinColumn(name=\"mySuperFirstName\"),\n\t@PrimaryKeyJoinColumn(name=\"mySuperLastName\")\n})'"
+ * @generated
+ */
+public interface Child extends Person {
+} // Child
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/CompositefkidFactory.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/CompositefkidFactory.java
new file mode 100644
index 000000000..803e40740
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/CompositefkidFactory.java
@@ -0,0 +1,69 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage
+ * @generated
+ */
+public interface CompositefkidFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	CompositefkidFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Parent</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Parent</em>'.
+	 * @generated
+	 */
+	Parent createParent();
+
+	/**
+	 * Returns a new object of class '<em>Child</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Child</em>'.
+	 * @generated
+	 */
+	Child createChild();
+
+	/**
+	 * Returns a new object of class '<em>Person</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Person</em>'.
+	 * @generated
+	 */
+	Person createPerson();
+
+	/**
+	 * Returns a new object of class '<em>Name</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Name</em>'.
+	 * @generated
+	 */
+	Name createName();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	CompositefkidPackage getCompositefkidPackage();
+
+} //CompositefkidFactory
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/CompositefkidPackage.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/CompositefkidPackage.java
new file mode 100644
index 000000000..7c8ef8005
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/CompositefkidPackage.java
@@ -0,0 +1,425 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface CompositefkidPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "compositefkid";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http:///org/elver/samples/emf/annotations/compositefkid.ecore";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "org.eclipse.emf.teneo.samples.emf.annotations.compositefkid";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	CompositefkidPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.PersonImpl <em>Person</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.PersonImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getPerson()
+	 * @generated
+	 */
+	int PERSON = 2;
+
+	/**
+	 * The feature id for the '<em><b>First Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__FIRST_NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Last Name</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__LAST_NAME = 1;
+
+	/**
+	 * The number of structural features of the '<em>Person</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Person</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl <em>Parent</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getParent()
+	 * @generated
+	 */
+	int PARENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>First Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARENT__FIRST_NAME = PERSON__FIRST_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Name</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARENT__LAST_NAME = PERSON__LAST_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Relations</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARENT__RELATIONS = PERSON_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Parent</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARENT_FEATURE_COUNT = PERSON_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Parent</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARENT_OPERATION_COUNT = PERSON_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ChildImpl <em>Child</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ChildImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getChild()
+	 * @generated
+	 */
+	int CHILD = 1;
+
+	/**
+	 * The feature id for the '<em><b>First Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD__FIRST_NAME = PERSON__FIRST_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Name</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD__LAST_NAME = PERSON__LAST_NAME;
+
+	/**
+	 * The number of structural features of the '<em>Child</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_FEATURE_COUNT = PERSON_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Child</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHILD_OPERATION_COUNT = PERSON_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl <em>Name</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getName_()
+	 * @generated
+	 */
+	int NAME = 3;
+
+	/**
+	 * The feature id for the '<em><b>Last Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAME__LAST_NAME = 0;
+
+	/**
+	 * The number of structural features of the '<em>Name</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAME_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Name</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAME_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Parent</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent
+	 * @generated
+	 */
+	EClass getParent();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent#getRelations <em>Relations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Relations</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent#getRelations()
+	 * @see #getParent()
+	 * @generated
+	 */
+	EReference getParent_Relations();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child <em>Child</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Child</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child
+	 * @generated
+	 */
+	EClass getChild();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person <em>Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Person</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person
+	 * @generated
+	 */
+	EClass getPerson();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getFirstName <em>First Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>First Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getFirstName()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EAttribute getPerson_FirstName();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getLastName <em>Last Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Last Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getLastName()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EReference getPerson_LastName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name
+	 * @generated
+	 */
+	EClass getName_();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name#getLastName <em>Last Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Name</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name#getLastName()
+	 * @see #getName_()
+	 * @generated
+	 */
+	EAttribute getName_LastName();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	CompositefkidFactory getCompositefkidFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl <em>Parent</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getParent()
+		 * @generated
+		 */
+		EClass PARENT = eINSTANCE.getParent();
+
+		/**
+		 * The meta object literal for the '<em><b>Relations</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PARENT__RELATIONS = eINSTANCE.getParent_Relations();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ChildImpl <em>Child</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ChildImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getChild()
+		 * @generated
+		 */
+		EClass CHILD = eINSTANCE.getChild();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.PersonImpl <em>Person</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.PersonImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getPerson()
+		 * @generated
+		 */
+		EClass PERSON = eINSTANCE.getPerson();
+
+		/**
+		 * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PERSON__FIRST_NAME = eINSTANCE.getPerson_FirstName();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Name</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PERSON__LAST_NAME = eINSTANCE.getPerson_LastName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl <em>Name</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.CompositefkidPackageImpl#getName_()
+		 * @generated
+		 */
+		EClass NAME = eINSTANCE.getName_();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute NAME__LAST_NAME = eINSTANCE.getName_LastName();
+
+	}
+
+} //CompositefkidPackage
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Name.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Name.java
new file mode 100644
index 000000000..5b281b637
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Name.java
@@ -0,0 +1,50 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Name</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name#getLastName <em>Last Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getName_()
+ * @model
+ * @generated
+ */
+public interface Name extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Last Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Name</em>' attribute.
+	 * @see #setLastName(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getName_LastName()
+	 * @model
+	 * @generated
+	 */
+	String getLastName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name#getLastName <em>Last Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Name</em>' attribute.
+	 * @see #getLastName()
+	 * @generated
+	 */
+	void setLastName(String value);
+
+} // Name
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Parent.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Parent.java
new file mode 100644
index 000000000..278af5d80
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Parent.java
@@ -0,0 +1,40 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Parent</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent#getRelations <em>Relations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getParent()
+ * @model annotation="teneo.jpa appinfo='@PrimaryKeyJoinColumns({\n\t@PrimaryKeyJoinColumn(name=\"mySuperFirstName\"),\n\t@PrimaryKeyJoinColumn(name=\"mySuperLastName\")\n})'"
+ * @generated
+ */
+public interface Parent extends Person {
+	/**
+	 * Returns the value of the '<em><b>Relations</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Relations</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Relations</em>' reference list.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getParent_Relations()
+	 * @model annotation="teneo.jpa appinfo='@JoinColumns({\n\t@JoinColumn(name=\"myParentFirstName\", referencedColumnName=\"firstName\"),\n\t@JoinColumn(name=\"myParentLastName\", referencedColumnName=\"lastName\")\n})'"
+	 * @generated
+	 */
+	EList<Person> getRelations();
+
+} // Parent
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Person.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Person.java
new file mode 100644
index 000000000..511ae3dd7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/Person.java
@@ -0,0 +1,78 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Person</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getFirstName <em>First Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getLastName <em>Last Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getPerson()
+ * @model annotation="teneo.jpa appinfo='@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID)'"
+ * @generated
+ */
+public interface Person extends EObject {
+	/**
+	 * Returns the value of the '<em><b>First Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>First Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>First Name</em>' attribute.
+	 * @see #setFirstName(String)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getPerson_FirstName()
+	 * @model annotation="teneo.jpa appinfo='@Id'"
+	 * @generated
+	 */
+	String getFirstName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getFirstName <em>First Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>First Name</em>' attribute.
+	 * @see #getFirstName()
+	 * @generated
+	 */
+	void setFirstName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Last Name</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Name</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Name</em>' reference.
+	 * @see #setLastName(Name)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#getPerson_LastName()
+	 * @model required="true"
+	 *        annotation="teneo.jpa appinfo='@Id\n@JoinColumn(name=\"lastName\")'"
+	 * @generated
+	 */
+	Name getLastName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person#getLastName <em>Last Name</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Name</em>' reference.
+	 * @see #getLastName()
+	 * @generated
+	 */
+	void setLastName(Name value);
+
+} // Person
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/PersonID.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/PersonID.java
new file mode 100755
index 000000000..674bf4121
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/PersonID.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006, 2007, 2008 Springsite BV (The Netherlands) and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Martin Taal
+ * </copyright>
+ *
+ * $Id: PersonID.java,v 1.4 2008/02/28 07:08:07 mtaal Exp $
+ */
+
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid;
+
+
+import java.io.Serializable;
+
+/**
+ * The id class used in the composite id test case
+ *  
+ * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
+ * @version $Revision: 1.4 $
+*/
+public class PersonID implements Serializable {
+	
+	private static String delimiter = "__;__";
+	
+	public String firstName;
+	public Name lastName;
+	
+	/** No-arg constructor */
+	public PersonID() {}
+	
+	public int hashCode() {
+	    return firstName.hashCode() + lastName.getLastName().hashCode();
+	}
+
+	public String toString() {
+		return firstName + delimiter + lastName;
+	}
+
+	public boolean equals(Object other)	{
+	    if (other != null && (other instanceof PersonID)) {
+	        PersonID p = (PersonID)other;
+	        return p.firstName.equals(firstName) && p.lastName.equals(lastName);
+	    }
+	    return false;
+	}
+
+	/**
+	 * @return the firstName
+	 */
+	public String getFirstName() {
+		return firstName;
+	}
+
+	/**
+	 * @param firstName the firstName to set
+	 */
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	/**
+	 * @return the lastName
+	 */
+	public Name getLastName() {
+		return lastName;
+	}
+
+	/**
+	 * @param lastName the lastName to set
+	 */
+	public void setLastName(Name lastName) {
+		this.lastName = lastName;
+	}
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/ChildImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/ChildImpl.java
new file mode 100644
index 000000000..ec35a85af
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/ChildImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Child</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ChildImpl extends PersonImpl implements Child {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChildImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CompositefkidPackage.Literals.CHILD;
+	}
+
+} //ChildImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/CompositefkidFactoryImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/CompositefkidFactoryImpl.java
new file mode 100644
index 000000000..b75a915e0
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/CompositefkidFactoryImpl.java
@@ -0,0 +1,128 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CompositefkidFactoryImpl extends EFactoryImpl implements CompositefkidFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static CompositefkidFactory init() {
+		try {
+			CompositefkidFactory theCompositefkidFactory = (CompositefkidFactory)EPackage.Registry.INSTANCE.getEFactory(CompositefkidPackage.eNS_URI);
+			if (theCompositefkidFactory != null) {
+				return theCompositefkidFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new CompositefkidFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositefkidFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case CompositefkidPackage.PARENT: return createParent();
+			case CompositefkidPackage.CHILD: return createChild();
+			case CompositefkidPackage.PERSON: return createPerson();
+			case CompositefkidPackage.NAME: return createName();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Parent createParent() {
+		ParentImpl parent = new ParentImpl();
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Child createChild() {
+		ChildImpl child = new ChildImpl();
+		return child;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Person createPerson() {
+		PersonImpl person = new PersonImpl();
+		return person;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Name createName() {
+		NameImpl name = new NameImpl();
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositefkidPackage getCompositefkidPackage() {
+		return (CompositefkidPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static CompositefkidPackage getPackage() {
+		return CompositefkidPackage.eINSTANCE;
+	}
+
+} //CompositefkidFactoryImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/CompositefkidPackageImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/CompositefkidPackageImpl.java
new file mode 100644
index 000000000..139bc4f0d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/CompositefkidPackageImpl.java
@@ -0,0 +1,326 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidFactory;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CompositefkidPackageImpl extends EPackageImpl implements CompositefkidPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass parentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass childEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass personEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass nameEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private CompositefkidPackageImpl() {
+		super(eNS_URI, CompositefkidFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link CompositefkidPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static CompositefkidPackage init() {
+		if (isInited) return (CompositefkidPackage)EPackage.Registry.INSTANCE.getEPackage(CompositefkidPackage.eNS_URI);
+
+		// Obtain or create and register package
+		CompositefkidPackageImpl theCompositefkidPackage = (CompositefkidPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompositefkidPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CompositefkidPackageImpl());
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theCompositefkidPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theCompositefkidPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theCompositefkidPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(CompositefkidPackage.eNS_URI, theCompositefkidPackage);
+		return theCompositefkidPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getParent() {
+		return parentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getParent_Relations() {
+		return (EReference)parentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getChild() {
+		return childEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getPerson() {
+		return personEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getPerson_FirstName() {
+		return (EAttribute)personEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPerson_LastName() {
+		return (EReference)personEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getName_() {
+		return nameEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getName_LastName() {
+		return (EAttribute)nameEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositefkidFactory getCompositefkidFactory() {
+		return (CompositefkidFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		parentEClass = createEClass(PARENT);
+		createEReference(parentEClass, PARENT__RELATIONS);
+
+		childEClass = createEClass(CHILD);
+
+		personEClass = createEClass(PERSON);
+		createEAttribute(personEClass, PERSON__FIRST_NAME);
+		createEReference(personEClass, PERSON__LAST_NAME);
+
+		nameEClass = createEClass(NAME);
+		createEAttribute(nameEClass, NAME__LAST_NAME);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		parentEClass.getESuperTypes().add(this.getPerson());
+		childEClass.getESuperTypes().add(this.getPerson());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getParent_Relations(), this.getPerson(), null, "relations", null, 0, -1, Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPerson_FirstName(), ecorePackage.getEString(), "firstName", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPerson_LastName(), this.getName_(), null, "lastName", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(nameEClass, Name.class, "Name", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getName_LastName(), ecorePackage.getEString(), "lastName", null, 0, 1, Name.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// teneo.jpa
+		createTeneoAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>teneo.jpa</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createTeneoAnnotations() {
+		String source = "teneo.jpa";	
+		addAnnotation
+		  (parentEClass, 
+		   source, 
+		   new String[] {
+			 "appinfo", "@PrimaryKeyJoinColumns({\n\t@PrimaryKeyJoinColumn(name=\"mySuperFirstName\"),\n\t@PrimaryKeyJoinColumn(name=\"mySuperLastName\")\n})"
+		   });	
+		addAnnotation
+		  (getParent_Relations(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "@JoinColumns({\n\t@JoinColumn(name=\"myParentFirstName\", referencedColumnName=\"firstName\"),\n\t@JoinColumn(name=\"myParentLastName\", referencedColumnName=\"lastName\")\n})"
+		   });	
+		addAnnotation
+		  (childEClass, 
+		   source, 
+		   new String[] {
+			 "appinfo", "@PrimaryKeyJoinColumns({\n\t@PrimaryKeyJoinColumn(name=\"mySuperFirstName\"),\n\t@PrimaryKeyJoinColumn(name=\"mySuperLastName\")\n})"
+		   });	
+		addAnnotation
+		  (personEClass, 
+		   source, 
+		   new String[] {
+			 "appinfo", "@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID)"
+		   });	
+		addAnnotation
+		  (getPerson_FirstName(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "@Id"
+		   });	
+		addAnnotation
+		  (getPerson_LastName(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "@Id\n@JoinColumn(name=\"lastName\")"
+		   });
+	}
+
+} //CompositefkidPackageImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/NameImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/NameImpl.java
new file mode 100644
index 000000000..6742cfe77
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/NameImpl.java
@@ -0,0 +1,163 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Name</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.NameImpl#getLastName <em>Last Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NameImpl extends MinimalEObjectImpl.Container implements Name {
+	/**
+	 * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LAST_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String lastName = LAST_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NameImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CompositefkidPackage.Literals.NAME;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLastName() {
+		return lastName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastName(String newLastName) {
+		String oldLastName = lastName;
+		lastName = newLastName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CompositefkidPackage.NAME__LAST_NAME, oldLastName, lastName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CompositefkidPackage.NAME__LAST_NAME:
+				return getLastName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CompositefkidPackage.NAME__LAST_NAME:
+				setLastName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CompositefkidPackage.NAME__LAST_NAME:
+				setLastName(LAST_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CompositefkidPackage.NAME__LAST_NAME:
+				return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (lastName: ");
+		result.append(lastName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //NameImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/ParentImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/ParentImpl.java
new file mode 100644
index 000000000..beb472363
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/ParentImpl.java
@@ -0,0 +1,132 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Parent</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.ParentImpl#getRelations <em>Relations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ParentImpl extends PersonImpl implements Parent {
+	/**
+	 * The cached value of the '{@link #getRelations() <em>Relations</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRelations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Person> relations;
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ParentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CompositefkidPackage.Literals.PARENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Person> getRelations() {
+		if (relations == null) {
+			relations = new EObjectResolvingEList<Person>(Person.class, this, CompositefkidPackage.PARENT__RELATIONS);
+		}
+		return relations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CompositefkidPackage.PARENT__RELATIONS:
+				return getRelations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CompositefkidPackage.PARENT__RELATIONS:
+				getRelations().clear();
+				getRelations().addAll((Collection<? extends Person>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CompositefkidPackage.PARENT__RELATIONS:
+				getRelations().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CompositefkidPackage.PARENT__RELATIONS:
+				return relations != null && !relations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ParentImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/PersonImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/PersonImpl.java
new file mode 100644
index 000000000..7adc278c7
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/impl/PersonImpl.java
@@ -0,0 +1,225 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name;
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Person</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.PersonImpl#getFirstName <em>First Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.impl.PersonImpl#getLastName <em>Last Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PersonImpl extends MinimalEObjectImpl.Container implements Person {
+	/**
+	 * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFirstName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FIRST_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFirstName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String firstName = FIRST_NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLastName() <em>Last Name</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Name lastName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PersonImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CompositefkidPackage.Literals.PERSON;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFirstName() {
+		return firstName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFirstName(String newFirstName) {
+		String oldFirstName = firstName;
+		firstName = newFirstName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CompositefkidPackage.PERSON__FIRST_NAME, oldFirstName, firstName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Name getLastName() {
+		if (lastName != null && lastName.eIsProxy()) {
+			InternalEObject oldLastName = (InternalEObject)lastName;
+			lastName = (Name)eResolveProxy(oldLastName);
+			if (lastName != oldLastName) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CompositefkidPackage.PERSON__LAST_NAME, oldLastName, lastName));
+			}
+		}
+		return lastName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Name basicGetLastName() {
+		return lastName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastName(Name newLastName) {
+		Name oldLastName = lastName;
+		lastName = newLastName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CompositefkidPackage.PERSON__LAST_NAME, oldLastName, lastName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CompositefkidPackage.PERSON__FIRST_NAME:
+				return getFirstName();
+			case CompositefkidPackage.PERSON__LAST_NAME:
+				if (resolve) return getLastName();
+				return basicGetLastName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CompositefkidPackage.PERSON__FIRST_NAME:
+				setFirstName((String)newValue);
+				return;
+			case CompositefkidPackage.PERSON__LAST_NAME:
+				setLastName((Name)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CompositefkidPackage.PERSON__FIRST_NAME:
+				setFirstName(FIRST_NAME_EDEFAULT);
+				return;
+			case CompositefkidPackage.PERSON__LAST_NAME:
+				setLastName((Name)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CompositefkidPackage.PERSON__FIRST_NAME:
+				return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
+			case CompositefkidPackage.PERSON__LAST_NAME:
+				return lastName != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (firstName: ");
+		result.append(firstName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //PersonImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/model/compositefkid.ecore b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/model/compositefkid.ecore
new file mode 100755
index 000000000..d53527374
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/model/compositefkid.ecore
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="compositefkid" nsURI="http:///org/elver/samples/emf/annotations/compositefkid.ecore"
+    nsPrefix="org.eclipse.emf.teneo.samples.emf.annotations.compositefkid">
+  <eClassifiers xsi:type="ecore:EClass" name="Parent" eSuperTypes="#//Person">
+    <eAnnotations source="teneo.jpa">
+      <details key="appinfo" value="@PrimaryKeyJoinColumns({&#xA;&#x9;@PrimaryKeyJoinColumn(name=&quot;mySuperFirstName&quot;),&#xA;&#x9;@PrimaryKeyJoinColumn(name=&quot;mySuperLastName&quot;)&#xA;})"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="relations" upperBound="-1"
+        eType="#//Person">
+      <eAnnotations source="teneo.jpa">
+        <details key="appinfo" value="@JoinColumns({&#xA;&#x9;@JoinColumn(name=&quot;myParentFirstName&quot;, referencedColumnName=&quot;firstName&quot;),&#xA;&#x9;@JoinColumn(name=&quot;myParentLastName&quot;, referencedColumnName=&quot;lastName&quot;)&#xA;})"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Child" eSuperTypes="#//Person">
+    <eAnnotations source="teneo.jpa">
+      <details key="appinfo" value="@PrimaryKeyJoinColumns({&#xA;&#x9;@PrimaryKeyJoinColumn(name=&quot;mySuperFirstName&quot;),&#xA;&#x9;@PrimaryKeyJoinColumn(name=&quot;mySuperLastName&quot;)&#xA;})"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Person">
+    <eAnnotations source="teneo.jpa">
+      <details key="appinfo" value="@IdClass(org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.PersonID)"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="teneo.jpa">
+        <details key="appinfo" value="@Id"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lastName" lowerBound="1"
+        eType="#//Name">
+      <eAnnotations source="teneo.jpa">
+        <details key="appinfo" value="@Id&#xA;@JoinColumn(name=&quot;lastName&quot;)"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Name">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/model/compositefkid.genmodel b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/model/compositefkid.genmodel
new file mode 100644
index 000000000..fd2e3a1d3
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/model/compositefkid.genmodel
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples"
+    modelName="Compositefkid" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>compositefkid.ecore</foreignModel>
+  <genPackages prefix="Compositefkid" basePackage="org.eclipse.emf.teneo.samples.emf.annotations"
+      disposableProviderFactory="true" ecorePackage="compositefkid.ecore#/">
+    <genClasses ecoreClass="compositefkid.ecore#//Parent">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compositefkid.ecore#//Parent/children"/>
+    </genClasses>
+    <genClasses ecoreClass="compositefkid.ecore#//Child"/>
+    <genClasses ecoreClass="compositefkid.ecore#//Person">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compositefkid.ecore#//Person/firstName"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compositefkid.ecore#//Person/lastName"/>
+    </genClasses>
+    <genClasses ecoreClass="compositefkid.ecore#//Name">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compositefkid.ecore#//Name/lastName"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/util/CompositefkidAdapterFactory.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/util/CompositefkidAdapterFactory.java
new file mode 100644
index 000000000..870d45435
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/util/CompositefkidAdapterFactory.java
@@ -0,0 +1,174 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage
+ * @generated
+ */
+public class CompositefkidAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static CompositefkidPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositefkidAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = CompositefkidPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CompositefkidSwitch<Adapter> modelSwitch =
+		new CompositefkidSwitch<Adapter>() {
+			@Override
+			public Adapter caseParent(Parent object) {
+				return createParentAdapter();
+			}
+			@Override
+			public Adapter caseChild(Child object) {
+				return createChildAdapter();
+			}
+			@Override
+			public Adapter casePerson(Person object) {
+				return createPersonAdapter();
+			}
+			@Override
+			public Adapter caseName(Name object) {
+				return createNameAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Parent
+	 * @generated
+	 */
+	public Adapter createParentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child <em>Child</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Child
+	 * @generated
+	 */
+	public Adapter createChildAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person <em>Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Person
+	 * @generated
+	 */
+	public Adapter createPersonAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.Name
+	 * @generated
+	 */
+	public Adapter createNameAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //CompositefkidAdapterFactory
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/util/CompositefkidSwitch.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/util/CompositefkidSwitch.java
new file mode 100644
index 000000000..ed95de87e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/compositefkid/util/CompositefkidSwitch.java
@@ -0,0 +1,175 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.compositefkid.CompositefkidPackage
+ * @generated
+ */
+public class CompositefkidSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static CompositefkidPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositefkidSwitch() {
+		if (modelPackage == null) {
+			modelPackage = CompositefkidPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case CompositefkidPackage.PARENT: {
+				Parent parent = (Parent)theEObject;
+				T result = caseParent(parent);
+				if (result == null) result = casePerson(parent);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CompositefkidPackage.CHILD: {
+				Child child = (Child)theEObject;
+				T result = caseChild(child);
+				if (result == null) result = casePerson(child);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CompositefkidPackage.PERSON: {
+				Person person = (Person)theEObject;
+				T result = casePerson(person);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CompositefkidPackage.NAME: {
+				Name name = (Name)theEObject;
+				T result = caseName(name);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Parent</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Parent</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseParent(Parent object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Child</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Child</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseChild(Child object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Person</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Person</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePerson(Person object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Name</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Name</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseName(Name object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //CompositefkidSwitch