274 files changed, 5360 insertions, 1208 deletions

diff --git a/examples/org.eclipse.emf.teneo.samples/.settings/org.eclipse.core.resources.prefs b/examples/org.eclipse.emf.teneo.samples/.settings/org.eclipse.core.resources.prefs
index 00d26beb9..862ae15c5 100644
--- a/examples/org.eclipse.emf.teneo.samples/.settings/org.eclipse.core.resources.prefs
+++ b/examples/org.eclipse.emf.teneo.samples/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
-#Thu Aug 10 22:01:27 CEST 2006
+#Thu Aug 31 21:10:13 CEST 2006
 eclipse.preferences.version=1
 encoding//src/org/eclipse/emf/teneo/samples/emf/annotations/associationoverride/model/associationoverride.ecore_diagram=UTF-8
+encoding//src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore_diagram=UTF-8
 encoding//src/org/eclipse/emf/teneo/samples/emf/sample/catalog/model/catalog.ecore_diagram=UTF-8
diff --git a/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
index 2ed131818..e2fd3e95d 100644
--- a/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.teneo.samples/META-INF/MANIFEST.MF
@@ -55,6 +55,9 @@ Export-Package: extlibrary,
  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.model,
  org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.util,
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id,
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl,
+ org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util,
  org.eclipse.emf.teneo.samples.emf.annotations.id,
  org.eclipse.emf.teneo.samples.emf.annotations.id.impl,
  org.eclipse.emf.teneo.samples.emf.annotations.id.model,
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdFactory.java
new file mode 100644
index 000000000..1135a6f36
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdFactory.java
@@ -0,0 +1,64 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdFactory.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;
+
+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.hb.generator.id.IdPackage
+ * @generated
+ */
+public interface IdFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	IdFactory eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Identity ID</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Identity ID</em>'.
+	 * @generated
+	 */
+	IdentityID createIdentityID();
+
+	/**
+	 * Returns a new object of class '<em>Simple ID</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Simple ID</em>'.
+	 * @generated
+	 */
+	SimpleID createSimpleID();
+
+	/**
+	 * Returns a new object of class '<em>Table ID</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table ID</em>'.
+	 * @generated
+	 */
+	TableID createTableID();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	IdPackage getIdPackage();
+
+} //IdFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdPackage.java
new file mode 100644
index 000000000..ea482960c
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdPackage.java
@@ -0,0 +1,288 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdPackage.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- 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 enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdFactory
+ * @model kind="package"
+ *        annotation="teneo.hibernate appinfo='\n@GenericGenerator(name=\"hibseq\", strategy = \"hilo\",\n    parameters = {\n        @Parameter(name=\"table\", value = \"hilo_table\"),\n        @Parameter(name=\"column\", value=\"the_hilo_column\")\n    }\n)\n\t\t'"
+ * @generated
+ */
+public interface IdPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "id";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "id";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	IdPackage eINSTANCE = org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl <em>Identity ID</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl#getIdentityID()
+	 * @generated
+	 */
+	int IDENTITY_ID = 0;
+
+	/**
+	 * The feature id for the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTITY_ID__MYID = 0;
+
+	/**
+	 * The number of structural features of the '<em>Identity ID</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTITY_ID_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl <em>Simple ID</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl#getSimpleID()
+	 * @generated
+	 */
+	int SIMPLE_ID = 1;
+
+	/**
+	 * The feature id for the '<em><b>Auto ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_ID__AUTO_ID = 0;
+
+	/**
+	 * The number of structural features of the '<em>Simple ID</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_ID_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl <em>Table ID</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl#getTableID()
+	 * @generated
+	 */
+	int TABLE_ID = 2;
+
+	/**
+	 * The feature id for the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_ID__MYID = 0;
+
+	/**
+	 * The number of structural features of the '<em>Table ID</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_ID_FEATURE_COUNT = 1;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID <em>Identity ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Identity ID</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID
+	 * @generated
+	 */
+	EClass getIdentityID();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID#getMyid <em>Myid</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Myid</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID#getMyid()
+	 * @see #getIdentityID()
+	 * @generated
+	 */
+	EAttribute getIdentityID_Myid();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID <em>Simple ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Simple ID</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID
+	 * @generated
+	 */
+	EClass getSimpleID();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID#getAutoID <em>Auto ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Auto ID</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID#getAutoID()
+	 * @see #getSimpleID()
+	 * @generated
+	 */
+	EAttribute getSimpleID_AutoID();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID <em>Table ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table ID</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID
+	 * @generated
+	 */
+	EClass getTableID();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID#getMyid <em>Myid</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Myid</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID#getMyid()
+	 * @see #getTableID()
+	 * @generated
+	 */
+	EAttribute getTableID_Myid();
+
+	/**
+	 * 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
+	 */
+	IdFactory getIdFactory();
+
+	/**
+	 * <!-- 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 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.hb.generator.id.impl.IdentityIDImpl <em>Identity ID</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl#getIdentityID()
+		 * @generated
+		 */
+		EClass IDENTITY_ID = eINSTANCE.getIdentityID();
+
+		/**
+		 * The meta object literal for the '<em><b>Myid</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IDENTITY_ID__MYID = eINSTANCE.getIdentityID_Myid();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl <em>Simple ID</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl#getSimpleID()
+		 * @generated
+		 */
+		EClass SIMPLE_ID = eINSTANCE.getSimpleID();
+
+		/**
+		 * The meta object literal for the '<em><b>Auto ID</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SIMPLE_ID__AUTO_ID = eINSTANCE.getSimpleID_AutoID();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl <em>Table ID</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdPackageImpl#getTableID()
+		 * @generated
+		 */
+		EClass TABLE_ID = eINSTANCE.getTableID();
+
+		/**
+		 * The meta object literal for the '<em><b>Myid</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_ID__MYID = eINSTANCE.getTableID_Myid();
+
+	}
+
+} //IdPackage
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdentityID.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdentityID.java
new file mode 100644
index 000000000..27bdcc36a
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/IdentityID.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdentityID.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Identity ID</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage#getIdentityID()
+ * @model extendedMetaData="name='IdentityID' kind='elementOnly'"
+ * @generated
+ */
+public interface IdentityID extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Myid</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #setMyid(long)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage#getIdentityID_Myid()
+	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
+	 *        annotation="teneo.hibernate appinfo='\n\t\t\t\t@Id @GeneratedValue(strategy=\"IDENTITY\")\n\t\t\t'"
+	 *        extendedMetaData="kind='element' name='myid'"
+	 * @generated
+	 */
+	long getMyid();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @generated
+	 */
+	void setMyid(long value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	void unsetMyid();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID#getMyid <em>Myid</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Myid</em>' attribute is set.
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	boolean isSetMyid();
+
+} // IdentityID
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/SimpleID.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/SimpleID.java
new file mode 100644
index 000000000..4f34569ac
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/SimpleID.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SimpleID.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple ID</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID#getAutoID <em>Auto ID</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage#getSimpleID()
+ * @model extendedMetaData="name='SimpleID' kind='elementOnly'"
+ * @generated
+ */
+public interface SimpleID extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Auto ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Auto ID</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Auto ID</em>' attribute.
+	 * @see #isSetAutoID()
+	 * @see #unsetAutoID()
+	 * @see #setAutoID(long)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage#getSimpleID_AutoID()
+	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
+	 *        annotation="teneo.hibernate appinfo='\n\t\t\t\t@Id @GeneratedValue \n\t\t\t\t@Column(name=\"AUTOD\" nullable=\"false\")\n\t\t\t'"
+	 *        extendedMetaData="kind='element' name='autoID'"
+	 * @generated
+	 */
+	long getAutoID();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID#getAutoID <em>Auto ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Auto ID</em>' attribute.
+	 * @see #isSetAutoID()
+	 * @see #unsetAutoID()
+	 * @see #getAutoID()
+	 * @generated
+	 */
+	void setAutoID(long value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID#getAutoID <em>Auto ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetAutoID()
+	 * @see #getAutoID()
+	 * @see #setAutoID(long)
+	 * @generated
+	 */
+	void unsetAutoID();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID#getAutoID <em>Auto ID</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Auto ID</em>' attribute is set.
+	 * @see #unsetAutoID()
+	 * @see #getAutoID()
+	 * @see #setAutoID(long)
+	 * @generated
+	 */
+	boolean isSetAutoID();
+
+} // SimpleID
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/TableID.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/TableID.java
new file mode 100644
index 000000000..bf4a7b162
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/TableID.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TableID.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table ID</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage#getTableID()
+ * @model extendedMetaData="name='TableID' kind='elementOnly'"
+ * @generated
+ */
+public interface TableID extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Myid</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #setMyid(long)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage#getTableID_Myid()
+	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
+	 *        annotation="teneo.hibernate appinfo='\n\t\t\t\t@Id @GeneratedValue(generator=\"hibseq\")\n\t\t\t'"
+	 *        extendedMetaData="kind='element' name='myid'"
+	 * @generated
+	 */
+	long getMyid();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @generated
+	 */
+	void setMyid(long value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	void unsetMyid();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID#getMyid <em>Myid</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Myid</em>' attribute is set.
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	boolean isSetMyid();
+
+} // TableID
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdFactoryImpl.java
new file mode 100644
index 000000000..6bf55c909
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdFactoryImpl.java
@@ -0,0 +1,119 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdFactoryImpl.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.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.hb.generator.id.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdFactoryImpl extends EFactoryImpl implements IdFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static IdFactory init() {
+		try {
+			IdFactory theIdFactory = (IdFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id"); 
+			if (theIdFactory != null) {
+				return theIdFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new IdFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case IdPackage.IDENTITY_ID: return createIdentityID();
+			case IdPackage.SIMPLE_ID: return createSimpleID();
+			case IdPackage.TABLE_ID: return createTableID();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdentityID createIdentityID() {
+		IdentityIDImpl identityID = new IdentityIDImpl();
+		return identityID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SimpleID createSimpleID() {
+		SimpleIDImpl simpleID = new SimpleIDImpl();
+		return simpleID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableID createTableID() {
+		TableIDImpl tableID = new TableIDImpl();
+		return tableID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdPackage getIdPackage() {
+		return (IdPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	public static IdPackage getPackage() {
+		return IdPackage.eINSTANCE;
+	}
+
+} //IdFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdPackageImpl.java
new file mode 100644
index 000000000..d242d9819
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdPackageImpl.java
@@ -0,0 +1,348 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdPackageImpl.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdFactory;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdPackageImpl extends EPackageImpl implements IdPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass identityIDEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass simpleIDEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableIDEClass = 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.hb.generator.id.IdPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private IdPackageImpl() {
+		super(eNS_URI, IdFactory.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.  Simple
+	 * dependencies are satisfied by calling this method on all
+	 * dependent packages before doing anything else.  This method drives
+	 * initialization for interdependent packages directly, in parallel
+	 * with this package, itself.
+	 * <p>Of this package and its interdependencies, all packages which
+	 * have not yet been registered by their URI values are first created
+	 * and registered.  The packages are then initialized in two steps:
+	 * meta-model objects for all of the packages are created before any
+	 * are initialized, since one package's meta-model objects may refer to
+	 * those of another.
+	 * <p>Invocation of this method will not affect any packages that have
+	 * already been initialized.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static IdPackage init() {
+		if (isInited) return (IdPackage)EPackage.Registry.INSTANCE.getEPackage(IdPackage.eNS_URI);
+
+		// Obtain or create and register package
+		IdPackageImpl theIdPackage = (IdPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof IdPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new IdPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		XMLTypePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theIdPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theIdPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theIdPackage.freeze();
+
+		return theIdPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getIdentityID() {
+		return identityIDEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getIdentityID_Myid() {
+		return (EAttribute)identityIDEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getSimpleID() {
+		return simpleIDEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSimpleID_AutoID() {
+		return (EAttribute)simpleIDEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getTableID() {
+		return tableIDEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTableID_Myid() {
+		return (EAttribute)tableIDEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdFactory getIdFactory() {
+		return (IdFactory)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
+		identityIDEClass = createEClass(IDENTITY_ID);
+		createEAttribute(identityIDEClass, IDENTITY_ID__MYID);
+
+		simpleIDEClass = createEClass(SIMPLE_ID);
+		createEAttribute(simpleIDEClass, SIMPLE_ID__AUTO_ID);
+
+		tableIDEClass = createEClass(TABLE_ID);
+		createEAttribute(tableIDEClass, TABLE_ID__MYID);
+	}
+
+	/**
+	 * <!-- 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);
+
+		// Obtain other dependent packages
+		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+
+		// Add supertypes to classes
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(identityIDEClass, IdentityID.class, "IdentityID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIdentityID_Myid(), theXMLTypePackage.getLong(), "myid", null, 1, 1, IdentityID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(simpleIDEClass, SimpleID.class, "SimpleID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSimpleID_AutoID(), theXMLTypePackage.getLong(), "autoID", null, 1, 1, SimpleID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(tableIDEClass, TableID.class, "TableID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTableID_Myid(), theXMLTypePackage.getLong(), "myid", null, 1, 1, TableID.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.hibernate
+		createTeneoAnnotations();
+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+		createExtendedMetaDataAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>teneo.hibernate</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createTeneoAnnotations() {
+		String source = "teneo.hibernate";		
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n@GenericGenerator(name=\"hibseq\", strategy = \"hilo\",\n    parameters = {\n        @Parameter(name=\"table\", value = \"hilo_table\"),\n        @Parameter(name=\"column\", value=\"the_hilo_column\")\n    }\n)\n\t\t"
+		   });			
+		addAnnotation
+		  (getIdentityID_Myid(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n\t\t\t\t@Id @GeneratedValue(strategy=\"IDENTITY\")\n\t\t\t"
+		   });				
+		addAnnotation
+		  (getSimpleID_AutoID(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n\t\t\t\t@Id @GeneratedValue \n\t\t\t\t@Column(name=\"AUTOD\" nullable=\"false\")\n\t\t\t"
+		   });				
+		addAnnotation
+		  (getTableID_Myid(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n\t\t\t\t@Id @GeneratedValue(generator=\"hibseq\")\n\t\t\t"
+		   });	
+	}
+
+	/**
+	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createExtendedMetaDataAnnotations() {
+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
+		addAnnotation
+		  (identityIDEClass, 
+		   source, 
+		   new String[] {
+			 "name", "IdentityID",
+			 "kind", "elementOnly"
+		   });			
+		addAnnotation
+		  (getIdentityID_Myid(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "myid"
+		   });		
+		addAnnotation
+		  (simpleIDEClass, 
+		   source, 
+		   new String[] {
+			 "name", "SimpleID",
+			 "kind", "elementOnly"
+		   });			
+		addAnnotation
+		  (getSimpleID_AutoID(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "autoID"
+		   });		
+		addAnnotation
+		  (tableIDEClass, 
+		   source, 
+		   new String[] {
+			 "name", "TableID",
+			 "kind", "elementOnly"
+		   });			
+		addAnnotation
+		  (getTableID_Myid(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "myid"
+		   });
+	}
+
+} //IdPackageImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdentityIDImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdentityIDImpl.java
new file mode 100644
index 000000000..fdb1944fc
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/IdentityIDImpl.java
@@ -0,0 +1,195 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdentityIDImpl.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.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.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Identity ID</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.IdentityIDImpl#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class IdentityIDImpl extends EObjectImpl implements IdentityID {
+	/**
+	 * The default value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final long MYID_EDEFAULT = 0L;
+
+	/**
+	 * The cached value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected long myid = MYID_EDEFAULT;
+
+	/**
+	 * This is true if the Myid attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean myidESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdentityIDImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return IdPackage.Literals.IDENTITY_ID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public long getMyid() {
+		return myid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMyid(long newMyid) {
+		long oldMyid = myid;
+		myid = newMyid;
+		boolean oldMyidESet = myidESet;
+		myidESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IdPackage.IDENTITY_ID__MYID, oldMyid, myid, !oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetMyid() {
+		long oldMyid = myid;
+		boolean oldMyidESet = myidESet;
+		myid = MYID_EDEFAULT;
+		myidESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, IdPackage.IDENTITY_ID__MYID, oldMyid, MYID_EDEFAULT, oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetMyid() {
+		return myidESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case IdPackage.IDENTITY_ID__MYID:
+				return new Long(getMyid());
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case IdPackage.IDENTITY_ID__MYID:
+				setMyid(((Long)newValue).longValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case IdPackage.IDENTITY_ID__MYID:
+				unsetMyid();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case IdPackage.IDENTITY_ID__MYID:
+				return isSetMyid();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (myid: ");
+		if (myidESet) result.append(myid); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //IdentityIDImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/SimpleIDImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/SimpleIDImpl.java
new file mode 100644
index 000000000..e65147c9b
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/SimpleIDImpl.java
@@ -0,0 +1,195 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SimpleIDImpl.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.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.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple ID</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.SimpleIDImpl#getAutoID <em>Auto ID</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SimpleIDImpl extends EObjectImpl implements SimpleID {
+	/**
+	 * The default value of the '{@link #getAutoID() <em>Auto ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAutoID()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final long AUTO_ID_EDEFAULT = 0L;
+
+	/**
+	 * The cached value of the '{@link #getAutoID() <em>Auto ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAutoID()
+	 * @generated
+	 * @ordered
+	 */
+	protected long autoID = AUTO_ID_EDEFAULT;
+
+	/**
+	 * This is true if the Auto ID attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean autoIDESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SimpleIDImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return IdPackage.Literals.SIMPLE_ID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public long getAutoID() {
+		return autoID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAutoID(long newAutoID) {
+		long oldAutoID = autoID;
+		autoID = newAutoID;
+		boolean oldAutoIDESet = autoIDESet;
+		autoIDESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IdPackage.SIMPLE_ID__AUTO_ID, oldAutoID, autoID, !oldAutoIDESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetAutoID() {
+		long oldAutoID = autoID;
+		boolean oldAutoIDESet = autoIDESet;
+		autoID = AUTO_ID_EDEFAULT;
+		autoIDESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, IdPackage.SIMPLE_ID__AUTO_ID, oldAutoID, AUTO_ID_EDEFAULT, oldAutoIDESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetAutoID() {
+		return autoIDESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case IdPackage.SIMPLE_ID__AUTO_ID:
+				return new Long(getAutoID());
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case IdPackage.SIMPLE_ID__AUTO_ID:
+				setAutoID(((Long)newValue).longValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case IdPackage.SIMPLE_ID__AUTO_ID:
+				unsetAutoID();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case IdPackage.SIMPLE_ID__AUTO_ID:
+				return isSetAutoID();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (autoID: ");
+		if (autoIDESet) result.append(autoID); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //SimpleIDImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/TableIDImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/TableIDImpl.java
new file mode 100644
index 000000000..ee80d9d37
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/impl/TableIDImpl.java
@@ -0,0 +1,195 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TableIDImpl.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.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.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table ID</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TableIDImpl extends EObjectImpl implements TableID {
+	/**
+	 * The default value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final long MYID_EDEFAULT = 0L;
+
+	/**
+	 * The cached value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected long myid = MYID_EDEFAULT;
+
+	/**
+	 * This is true if the Myid attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean myidESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableIDImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return IdPackage.Literals.TABLE_ID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public long getMyid() {
+		return myid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMyid(long newMyid) {
+		long oldMyid = myid;
+		myid = newMyid;
+		boolean oldMyidESet = myidESet;
+		myidESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IdPackage.TABLE_ID__MYID, oldMyid, myid, !oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetMyid() {
+		long oldMyid = myid;
+		boolean oldMyidESet = myidESet;
+		myid = MYID_EDEFAULT;
+		myidESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, IdPackage.TABLE_ID__MYID, oldMyid, MYID_EDEFAULT, oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetMyid() {
+		return myidESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case IdPackage.TABLE_ID__MYID:
+				return new Long(getMyid());
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case IdPackage.TABLE_ID__MYID:
+				setMyid(((Long)newValue).longValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case IdPackage.TABLE_ID__MYID:
+				unsetMyid();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case IdPackage.TABLE_ID__MYID:
+				return isSetMyid();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (myid: ");
+		if (myidESet) result.append(myid); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //TableIDImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore
new file mode 100644
index 000000000..3e3221df8
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore
@@ -0,0 +1,59 @@
+<?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="id"
+    nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id"
+    nsPrefix="id">
+  <eAnnotations source="teneo.hibernate">
+    <details key="appinfo" value="&#xA;@GenericGenerator(name=&quot;hibseq&quot;, strategy = &quot;hilo&quot;,&#xA;    parameters = {&#xA;        @Parameter(name=&quot;table&quot;, value = &quot;hilo_table&quot;),&#xA;        @Parameter(name=&quot;column&quot;, value=&quot;the_hilo_column&quot;)&#xA;    }&#xA;)&#xA;&#x9;&#x9;"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EClass" name="IdentityID">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="IdentityID"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="myid" unique="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true">
+      <eAnnotations source="teneo.hibernate">
+        <details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&#x9;@Id @GeneratedValue(strategy=&quot;IDENTITY&quot;)&#xA;&#x9;&#x9;&#x9;"/>
+      </eAnnotations>
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="myid"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SimpleID">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="SimpleID"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoID" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long"
+        unsettable="true">
+      <eAnnotations source="teneo.hibernate">
+        <details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&#x9;@Id @GeneratedValue &#xA;&#x9;&#x9;&#x9;&#x9;@Column(name=&quot;AUTOD&quot; nullable=&quot;false&quot;)&#xA;&#x9;&#x9;&#x9;"/>
+      </eAnnotations>
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="autoID"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TableID">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="TableID"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="myid" unique="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true">
+      <eAnnotations source="teneo.hibernate">
+        <details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&#x9;@Id @GeneratedValue(generator=&quot;hibseq&quot;)&#xA;&#x9;&#x9;&#x9;"/>
+      </eAnnotations>
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="myid"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore_diagram b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore_diagram
new file mode 100644
index 000000000..194d6724a
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.ecore_diagram
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmi:id="_VFyQwTkkEdu5Sv8ZTgiyXQ" type="Ecore" measurementUnit="Pixel">
+  <styles xmi:type="notation:PageStyle" xmi:id="_VFyQwjkkEdu5Sv8ZTgiyXQ"/>
+  <styles xmi:type="notation:GuideStyle" xmi:id="_VFyQwzkkEdu5Sv8ZTgiyXQ"/>
+  <styles xmi:type="notation:DescriptionStyle" xmi:id="_VFyQxDkkEdu5Sv8ZTgiyXQ"/>
+  <element xmi:type="ecore:EPackage" href="id.ecore#/"/>
+</notation:Diagram>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.genmodel
new file mode 100644
index 000000000..d0a7681a2
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.genmodel
@@ -0,0 +1,19 @@
+<?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="Id" importerID="org.eclipse.xsd.ecore.importer">
+  <foreignModel>id.xsd</foreignModel>
+  <genPackages prefix="Id" basePackage="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator"
+      resource="XML" disposableProviderFactory="true" ecorePackage="id.ecore#/">
+    <genClasses ecoreClass="id.ecore#//IdentityID">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//IdentityID/myid"/>
+    </genClasses>
+    <genClasses ecoreClass="id.ecore#//SimpleID">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//SimpleID/autoID"/>
+    </genClasses>
+    <genClasses ecoreClass="id.ecore#//TableID">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//TableID/myid"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.xsd
new file mode 100644
index 000000000..9ded01a88
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/model/id.xsd
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:lib="http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+	<xsd:annotation>
+		<xsd:appinfo source="teneo.hibernate">
+@GenericGenerator(name="hibseq", strategy = "hilo",
+    parameters = {
+        @Parameter(name="table", value = "hilo_table"),
+        @Parameter(name="column", value="the_hilo_column")
+    }
+)
+		</xsd:appinfo>
+	</xsd:annotation>
+
+  <xsd:complexType name="SimpleID">
+    <xsd:sequence>
+      <xsd:element name="autoID" type="xsd:long">
+	 	<xsd:annotation>
+			<xsd:appinfo source="teneo.hibernate">
+				@Id @GeneratedValue 
+				@Column(name="AUTOD" nullable="false")
+			</xsd:appinfo>
+	    </xsd:annotation>
+	  </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="TableID">
+    <xsd:sequence>
+      <xsd:element name="myid" type="xsd:long">
+	 	<xsd:annotation>
+			<xsd:appinfo source="teneo.hibernate">
+				@Id @GeneratedValue(generator="hibseq")
+			</xsd:appinfo>
+	    </xsd:annotation>
+	  </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="IdentityID">
+    <xsd:sequence>
+      <xsd:element name="myid" type="xsd:long">
+	 	<xsd:annotation>
+			<xsd:appinfo source="teneo.hibernate">
+				@Id @GeneratedValue(strategy="IDENTITY")
+			</xsd:appinfo>
+	    </xsd:annotation>
+	  </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+ </xsd:schema>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdAdapterFactory.java
new file mode 100644
index 000000000..d76f3b4f5
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdAdapterFactory.java
@@ -0,0 +1,154 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdAdapterFactory.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.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.hb.generator.id.*;
+
+/**
+ * <!-- 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.hb.generator.id.IdPackage
+ * @generated
+ */
+public class IdAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static IdPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = IdPackage.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
+	 */
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdSwitch modelSwitch =
+		new IdSwitch() {
+			public Object caseIdentityID(IdentityID object) {
+				return createIdentityIDAdapter();
+			}
+			public Object caseSimpleID(SimpleID object) {
+				return createSimpleIDAdapter();
+			}
+			public Object caseTableID(TableID object) {
+				return createTableIDAdapter();
+			}
+			public Object 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
+	 */
+	public Adapter createAdapter(Notifier target) {
+		return (Adapter)modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID <em>Identity ID</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.hb.generator.id.IdentityID
+	 * @generated
+	 */
+	public Adapter createIdentityIDAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID <em>Simple ID</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.hb.generator.id.SimpleID
+	 * @generated
+	 */
+	public Adapter createSimpleIDAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID <em>Table ID</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.hb.generator.id.TableID
+	 * @generated
+	 */
+	public Adapter createTableIDAdapter() {
+		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;
+	}
+
+} //IdAdapterFactory
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdResourceFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdResourceFactoryImpl.java
new file mode 100644
index 000000000..ed3c64624
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdResourceFactoryImpl.java
@@ -0,0 +1,55 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdResourceFactoryImpl.java,v 1.1 2006/08/31 22:47:45 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util.IdResourceImpl
+ * @generated
+ */
+public class IdResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Resource createResource(URI uri) {
+		XMLResource result = new IdResourceImpl(uri);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+		return result;
+	}
+
+} //IdResourceFactoryImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdResourceImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdResourceImpl.java
new file mode 100644
index 000000000..e97b4ef8f
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdResourceImpl.java
@@ -0,0 +1,32 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdResourceImpl.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util.IdResourceFactoryImpl
+ * @generated
+ */
+public class IdResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public IdResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} //IdResourceImpl
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdSwitch.java
new file mode 100644
index 000000000..34b57e0b5
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdSwitch.java
@@ -0,0 +1,172 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdSwitch.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.*;
+
+/**
+ * <!-- 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.hb.generator.id.IdPackage
+ * @generated
+ */
+public class IdSwitch {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static IdPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdSwitch() {
+		if (modelPackage == null) {
+			modelPackage = IdPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	public Object doSwitch(EObject theEObject) {
+		return doSwitch(theEObject.eClass(), theEObject);
+	}
+
+	/**
+	 * 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
+	 */
+	protected Object doSwitch(EClass theEClass, EObject theEObject) {
+		if (theEClass.eContainer() == modelPackage) {
+			return doSwitch(theEClass.getClassifierID(), theEObject);
+		}
+		else {
+			List eSuperTypes = theEClass.getESuperTypes();
+			return
+				eSuperTypes.isEmpty() ?
+					defaultCase(theEObject) :
+					doSwitch((EClass)eSuperTypes.get(0), theEObject);
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	protected Object doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case IdPackage.IDENTITY_ID: {
+				IdentityID identityID = (IdentityID)theEObject;
+				Object result = caseIdentityID(identityID);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case IdPackage.SIMPLE_ID: {
+				SimpleID simpleID = (SimpleID)theEObject;
+				Object result = caseSimpleID(simpleID);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case IdPackage.TABLE_ID: {
+				TableID tableID = (TableID)theEObject;
+				Object result = caseTableID(tableID);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Identity ID</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 interpretting the object as an instance of '<em>Identity ID</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseIdentityID(IdentityID object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Simple ID</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 interpretting the object as an instance of '<em>Simple ID</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseSimpleID(SimpleID object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Table ID</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 interpretting the object as an instance of '<em>Table ID</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseTableID(TableID object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting 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 interpretting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	public Object defaultCase(EObject object) {
+		return null;
+	}
+
+} //IdSwitch
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdXMLProcessor.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdXMLProcessor.java
new file mode 100644
index 000000000..81678d023
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/hb/generator/id/util/IdXMLProcessor.java
@@ -0,0 +1,50 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdXMLProcessor.java,v 1.1 2006/08/31 22:47:46 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdXMLProcessor extends XMLProcessor {
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		IdPackage.eINSTANCE.eClass();
+	}
+	
+	/**
+	 * Register for "*" and "xml" file extensions the IdResourceFactoryImpl factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map getRegistrations() {
+		if (registrations == null) {
+			super.getRegistrations();
+			registrations.put(XML_EXTENSION, new IdResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new IdResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} //IdXMLProcessor
diff --git a/plugins/org.eclipse.emf.teneo.annotations/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.teneo.annotations/META-INF/MANIFEST.MF
index 8b5bab3f4..02679f251 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.teneo.annotations/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Export-Package: org.eclipse.emf.teneo.annotations,
  org.eclipse.emf.teneo.annotations.pannotation,
  org.eclipse.emf.teneo.annotations.pannotation.impl,
  org.eclipse.emf.teneo.annotations.pannotation.util,
+ org.eclipse.emf.teneo.annotations.parser,
  org.eclipse.emf.teneo.annotations.processing,
  org.eclipse.emf.teneo.annotations.util,
  org.eclipse.emf.teneo.mapper
diff --git a/plugins/org.eclipse.emf.teneo.annotations/model/annotations.genmodel b/plugins/org.eclipse.emf.teneo.annotations/model/annotations.genmodel
index a6dc40dd4..6c6cc01c6 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/model/annotations.genmodel
+++ b/plugins/org.eclipse.emf.teneo.annotations/model/annotations.genmodel
@@ -30,26 +30,22 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/discriminatorColumn"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/discriminatorValue"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/embeddable"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/excludeDefaultListeners"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/excludeSuperclassListeners"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/mappedSuperclass"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/entity"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/entityListener"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/idClass"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/inheritance"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/joinColumn"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/primaryKeyJoinColumns"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/secondaryTables"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/sequenceGenerator"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/table"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/tableGenerator"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/associationOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/parsedAttributeOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEClass/parsedAssociationOverrides"/>
     </genClasses>
     <genClasses ecoreClass="pamodel.ecore#//PAnnotatedEStructuralFeature">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/paEClass"/>
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/annotatedEStructuralFeature"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/attributeOverrides"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/columns"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/joinTable"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/oneToMany"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/sequenceGenerator"/>
@@ -57,6 +53,9 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/joinColumns"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/indexed"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/unique"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/column"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/parsedAttributeOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEStructuralFeature/parsedJoinColumns"/>
     </genClasses>
     <genClasses ecoreClass="pamodel.ecore#//PAnnotatedEAttribute">
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEAttribute/annotatedEAttribute"/>
@@ -67,7 +66,6 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEAttribute/lob"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEAttribute/temporal"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEAttribute/version"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEAttribute/type"/>
     </genClasses>
     <genClasses ecoreClass="pamodel.ecore#//PAnnotatedEReference">
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEReference/annotatedEReference"/>
@@ -81,8 +79,8 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pamodel.ecore#//PAnnotatedEReference/primaryKeyJoinColumn"/>
     </genClasses>
   </genPackages>
-  <genPackages prefix="Pannotation" basePackage="org.eclipse.emf.teneo.annotations" disposableProviderFactory="true"
-      ecorePackage="pannotation.ecore#/">
+  <genPackages prefix="Pannotation" basePackage="org.eclipse.emf.teneo.annotations"
+      disposableProviderFactory="true" ecorePackage="pannotation.ecore#/">
     <genEnums ecoreEnum="pannotation.ecore#//CascadeType">
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//CascadeType/ALL"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//CascadeType/PERSIST"/>
@@ -103,10 +101,6 @@
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//FetchType/LAZY"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//FetchType/EAGER"/>
     </genEnums>
-    <genEnums ecoreEnum="pannotation.ecore#//FlushModeType">
-      <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//FlushModeType/AUTO"/>
-      <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//FlushModeType/COMMIT"/>
-    </genEnums>
     <genEnums ecoreEnum="pannotation.ecore#//GenerationType">
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//GenerationType/TABLE"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//GenerationType/SEQUENCE"/>
@@ -118,10 +112,6 @@
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//InheritanceType/TABLE_PER_CLASS"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//InheritanceType/JOINED"/>
     </genEnums>
-    <genEnums ecoreEnum="pannotation.ecore#//PersistenceContextType">
-      <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//PersistenceContextType/TRANSACTION"/>
-      <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//PersistenceContextType/EXTENDED"/>
-    </genEnums>
     <genEnums ecoreEnum="pannotation.ecore#//TemporalType">
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//TemporalType/DATE"/>
       <genEnumLiterals ecoreEnumLiteral="pannotation.ecore#//TemporalType/TIME"/>
@@ -160,12 +150,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Column/precision"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Column/scale"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//Columns">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//Columns/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//ColumnResult">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//ColumnResult/name"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//DiscriminatorColumn">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//DiscriminatorColumn/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//DiscriminatorColumn/discriminatorType"/>
@@ -181,26 +165,9 @@
     <genClasses ecoreClass="pannotation.ecore#//Entity">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Entity/name"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//EntityListener">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//EntityListener/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//EntityResult">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//EntityResult/entityClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//EntityResult/fields"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//EntityResult/discriminatorColumn"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//Enumerated">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Enumerated/value"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//ExcludeDefaultListeners"/>
-    <genClasses ecoreClass="pannotation.ecore#//ExcludeSuperclassListeners"/>
-    <genClasses ecoreClass="pannotation.ecore#//FieldResult">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//FieldResult/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//FieldResult/column"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//FlushMode">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//FlushMode/value"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//GeneratedValue">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//GeneratedValue/strategy"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//GeneratedValue/generator"/>
@@ -250,24 +217,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//MapKey/name"/>
     </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//MappedSuperclass"/>
-    <genClasses ecoreClass="pannotation.ecore#//NamedNativeQueries">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//NamedNativeQueries/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//NamedNativeQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//NamedNativeQuery/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//NamedNativeQuery/query"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//NamedNativeQuery/hints"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//NamedNativeQuery/resultClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//NamedNativeQuery/resultSetMapping"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//NamedQueries">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//NamedQueries/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//NamedQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//NamedQuery/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//NamedQuery/query"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//NamedQuery/hints"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//OneToMany">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//OneToMany/targetEntity"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//OneToMany/cascade"/>
@@ -284,32 +233,6 @@
     <genClasses ecoreClass="pannotation.ecore#//OrderBy">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//OrderBy/value"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//Parameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Parameter/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Parameter/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//PersistenceContext">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PersistenceContext/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PersistenceContext/unitName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PersistenceContext/type"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//PersistenceContexts">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//PersistenceContexts/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//PersistenceUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PersistenceUnit/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PersistenceUnit/unitName"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//PersistenceUnits">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//PersistenceUnits/value"/>
-    </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//PostLoad"/>
-    <genClasses ecoreClass="pannotation.ecore#//PostPersist"/>
-    <genClasses ecoreClass="pannotation.ecore#//PostRemove"/>
-    <genClasses ecoreClass="pannotation.ecore#//PostUpdate"/>
-    <genClasses ecoreClass="pannotation.ecore#//PrePersist"/>
-    <genClasses ecoreClass="pannotation.ecore#//PreRemove"/>
-    <genClasses ecoreClass="pannotation.ecore#//PreUpdate"/>
     <genClasses ecoreClass="pannotation.ecore#//PrimaryKeyJoinColumn">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PrimaryKeyJoinColumn/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//PrimaryKeyJoinColumn/referencedColumnName"/>
@@ -318,10 +241,6 @@
     <genClasses ecoreClass="pannotation.ecore#//PrimaryKeyJoinColumns">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//PrimaryKeyJoinColumns/value"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//QueryHint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//QueryHint/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//QueryHint/value"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//SecondaryTable">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//SecondaryTable/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//SecondaryTable/catalog"/>
@@ -338,11 +257,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//SequenceGenerator/initialValue"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//SequenceGenerator/allocationSize"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//SqlResultSetMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//SqlResultSetMapping/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//SqlResultSetMapping/entities"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference pannotation.ecore#//SqlResultSetMapping/columns"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//Table">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Table/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Table/catalog"/>
@@ -364,10 +278,6 @@
     <genClasses ecoreClass="pannotation.ecore#//Temporal">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Temporal/value"/>
     </genClasses>
-    <genClasses ecoreClass="pannotation.ecore#//Type">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//Type/type"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference pannotation.ecore#//Type/parameters"/>
-    </genClasses>
     <genClasses ecoreClass="pannotation.ecore#//Transient"/>
     <genClasses ecoreClass="pannotation.ecore#//UniqueConstraint">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute pannotation.ecore#//UniqueConstraint/columnNames"/>
diff --git a/plugins/org.eclipse.emf.teneo.annotations/model/pamodel.ecore b/plugins/org.eclipse.emf.teneo.annotations/model/pamodel.ecore
index 676d8dc3a..642bd5ab5 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/model/pamodel.ecore
+++ b/plugins/org.eclipse.emf.teneo.annotations/model/pamodel.ecore
@@ -82,14 +82,18 @@
         eType="ecore:EClass pannotation.ecore#//PrimaryKeyJoinColumns" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="secondaryTables" eType="ecore:EClass pannotation.ecore#//SecondaryTables"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="ecore:EClass pannotation.ecore#//SequenceGenerator"
-        containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="ecore:EClass pannotation.ecore#//Table"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="ecore:EClass pannotation.ecore#//TableGenerator"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="associationOverrides" eType="ecore:EClass pannotation.ecore#//AssociationOverrides"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parsedAttributeOverrides"
+        upperBound="-1" eType="ecore:EClass pannotation.ecore#//AttributeOverride"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parsedAssociationOverrides"
+        upperBound="-1" eType="ecore:EClass pannotation.ecore#//AssociationOverride"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PAnnotatedEStructuralFeature" abstract="true"
       eSuperTypes="#//PAnnotatedEModelElement">
@@ -127,6 +131,11 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="ecore:EClass pannotation.ecore#//Column"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parsedAttributeOverrides"
+        upperBound="-1" eType="ecore:EClass pannotation.ecore#//AttributeOverride"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parsedJoinColumns" upperBound="-1"
+        eType="ecore:EClass pannotation.ecore#//JoinColumn" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PAnnotatedEAttribute" eSuperTypes="#//PAnnotatedEStructuralFeature">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
diff --git a/plugins/org.eclipse.emf.teneo.annotations/model/pannotation.ecore b/plugins/org.eclipse.emf.teneo.annotations/model/pannotation.ecore
index d10ddbe47..82ca04c9c 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/model/pannotation.ecore
+++ b/plugins/org.eclipse.emf.teneo.annotations/model/pannotation.ecore
@@ -7,6 +7,10 @@
     <details key="Target" value="http://annotation.elver.org/internal/Target"/>
     <details key="Unsupported" value="http://annotation.elver.org/internal/Unsupported"/>
   </eAnnotations>
+  <eAnnotations source="teneo.mapping.source">
+    <details key="0" value="http://annotation.elver.org/"/>
+    <details key="1" value="http://ejb.elver.org/"/>
+  </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="PAnnotation" abstract="true" interface="true">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="constraints" value="CompatibleEModelElementType AnnotationIsSupported"/>
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEClass.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEClass.java
index a44d21b80..5a27e2f7c 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEClass.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEClass.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedEClass.java,v 1.3 2006/07/26 12:43:34 mtaal Exp $
+ * $Id: PAnnotatedEClass.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel;
 
@@ -22,7 +22,6 @@ import org.eclipse.emf.teneo.annotations.pannotation.InheritanceType;
 import org.eclipse.emf.teneo.annotations.pannotation.MappedSuperclass;
 import org.eclipse.emf.teneo.annotations.pannotation.PrimaryKeyJoinColumns;
 import org.eclipse.emf.teneo.annotations.pannotation.SecondaryTables;
-import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
 import org.eclipse.emf.teneo.annotations.pannotation.Table;
 import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
 
@@ -46,10 +45,11 @@ import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getInheritance <em>Inheritance</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getSecondaryTables <em>Secondary Tables</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getSequenceGenerator <em>Sequence Generator</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getTable <em>Table</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getTableGenerator <em>Table Generator</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getAssociationOverrides <em>Association Overrides</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getParsedAttributeOverrides <em>Parsed Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getParsedAssociationOverrides <em>Parsed Association Overrides</em>}</li>
  * </ul>
  * </p>
  *
@@ -393,31 +393,6 @@ public interface PAnnotatedEClass extends PAnnotatedEModelElement {
 	void setSecondaryTables(SecondaryTables value);
 
 	/**
-	 * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sequence Generator</em>' containment reference isn't clear, there really should be
-	 * more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sequence Generator</em>' containment reference.
-	 * @see #setSequenceGenerator(SequenceGenerator)
-	 * @see org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage#getPAnnotatedEClass_SequenceGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	SequenceGenerator getSequenceGenerator();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sequence Generator</em>' containment reference.
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 */
-	void setSequenceGenerator(SequenceGenerator value);
-
-	/**
 	 * Returns the value of the '<em><b>Table</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -494,6 +469,38 @@ public interface PAnnotatedEClass extends PAnnotatedEModelElement {
 	void setAssociationOverrides(AssociationOverrides value);
 
 	/**
+	 * Returns the value of the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parsed Attribute Overrides</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parsed Attribute Overrides</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage#getPAnnotatedEClass_ParsedAttributeOverrides()
+	 * @model type="org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride" containment="true"
+	 * @generated
+	 */
+	EList getParsedAttributeOverrides();
+
+	/**
+	 * Returns the value of the '<em><b>Parsed Association Overrides</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parsed Association Overrides</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parsed Association Overrides</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage#getPAnnotatedEClass_ParsedAssociationOverrides()
+	 * @model type="org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride" containment="true"
+	 * @generated
+	 */
+	EList getParsedAssociationOverrides();
+
+	/**
 	 * @return Returns the List of PAnnotatedEAttributes belonging to this PAnnotatedEClass for which an Id PAnnotation
 	 *         is present.
 	 */
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEPackage.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEPackage.java
index f57dcbf46..ef4e1bbf9 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEPackage.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEPackage.java
@@ -2,13 +2,13 @@
  * <copyright>

  * </copyright>

  *

- * $Id: PAnnotatedEPackage.java,v 1.2 2006/07/04 21:56:28 mtaal Exp $

+ * $Id: PAnnotatedEPackage.java,v 1.3 2006/08/31 22:46:54 mtaal Exp $

  */

 package org.eclipse.emf.teneo.annotations.pamodel;

 

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;

+import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
 import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;

 

 /**
@@ -30,7 +30,7 @@ import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
  * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='AtMostOneEClass'"
  * @generated
  */

-public interface PAnnotatedEPackage extends PAnnotatedEModelElement{

+public interface PAnnotatedEPackage extends PAnnotatedEModelElement {

 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @generated
@@ -109,27 +109,28 @@ public interface PAnnotatedEPackage extends PAnnotatedEModelElement{
 
 	/**
 	 * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sequence Generator</em>' containment reference isn't clear, there really should be

-	 * more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sequence Generator</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence Generator</em>' containment reference.
 	 * @see #setSequenceGenerator(SequenceGenerator)
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage#getPAnnotatedEPackage_SequenceGenerator()
 	 * @model containment="true"
 	 * @generated
-	 */

+	 */
 	SequenceGenerator getSequenceGenerator();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence Generator</em>' containment reference.
 	 * @see #getSequenceGenerator()
 	 * @generated
-	 */

+	 */
 	void setSequenceGenerator(SequenceGenerator value);
 
 	/**
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEStructuralFeature.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEStructuralFeature.java
index 9fee57ba6..1b52f5341 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEStructuralFeature.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedEStructuralFeature.java
@@ -2,10 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedEStructuralFeature.java,v 1.5 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PAnnotatedEStructuralFeature.java,v 1.6 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel;
 
+import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.Column;
@@ -35,6 +37,8 @@ import org.eclipse.emf.teneo.annotations.pannotation.Unique;
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getIndexed <em>Indexed</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getUnique <em>Unique</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getColumn <em>Column</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getParsedAttributeOverrides <em>Parsed Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getParsedJoinColumns <em>Parsed Join Columns</em>}</li>
  * </ul>
  * </p>
  *
@@ -326,4 +330,36 @@ public interface PAnnotatedEStructuralFeature extends PAnnotatedEModelElement {
 	 */
 	void setColumn(Column value);
 
+	/**
+	 * Returns the value of the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parsed Attribute Overrides</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parsed Attribute Overrides</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage#getPAnnotatedEStructuralFeature_ParsedAttributeOverrides()
+	 * @model type="org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride" containment="true"
+	 * @generated
+	 */
+	EList getParsedAttributeOverrides();
+
+	/**
+	 * Returns the value of the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.JoinColumn}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parsed Join Columns</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parsed Join Columns</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage#getPAnnotatedEStructuralFeature_ParsedJoinColumns()
+	 * @model type="org.eclipse.emf.teneo.annotations.pannotation.JoinColumn" containment="true"
+	 * @generated
+	 */
+	EList getParsedJoinColumns();
+
 } // PAnnotatedEStructuralFeature
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PamodelPackage.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PamodelPackage.java
index c9330e832..0a6afed9c 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PamodelPackage.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PamodelPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PamodelPackage.java,v 1.4 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PamodelPackage.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel;
 
@@ -347,22 +347,13 @@ public interface PamodelPackage extends EPackage {
 	int PANNOTATED_ECLASS__SECONDARY_TABLES = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PANNOTATED_ECLASS__SEQUENCE_GENERATOR = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 13;
-
-	/**
 	 * The feature id for the '<em><b>Table</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PANNOTATED_ECLASS__TABLE = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 14;
+	int PANNOTATED_ECLASS__TABLE = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
@@ -371,7 +362,7 @@ public interface PamodelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PANNOTATED_ECLASS__TABLE_GENERATOR = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 15;
+	int PANNOTATED_ECLASS__TABLE_GENERATOR = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference.
@@ -380,7 +371,25 @@ public interface PamodelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 16;
+	int PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 15;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 16;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Association Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 17;
 
 	/**
 	 * The number of structural features of the '<em>PAnnotated EClass</em>' class.
@@ -389,7 +398,7 @@ public interface PamodelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PANNOTATED_ECLASS_FEATURE_COUNT = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 17;
+	int PANNOTATED_ECLASS_FEATURE_COUNT = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 18;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl <em>PAnnotated EStructural Feature</em>}' class.
@@ -518,13 +527,31 @@ public interface PamodelPackage extends EPackage {
 	int PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 10;
 
 	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 12;
+
+	/**
 	 * The number of structural features of the the '<em>PAnnotated EStructural Feature</em>' class. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 11;
+	int PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT = PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 13;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEAttributeImpl <em>PAnnotated EAttribute</em>}' class.
@@ -653,6 +680,24 @@ public interface PamodelPackage extends EPackage {
 	int PANNOTATED_EATTRIBUTE__COLUMN = PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN;
 
 	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_EATTRIBUTE__PARSED_ATTRIBUTE_OVERRIDES = PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_EATTRIBUTE__PARSED_JOIN_COLUMNS = PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS;
+
+	/**
 	 * The feature id for the '<em><b>Annotated EAttribute</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -860,6 +905,24 @@ public interface PamodelPackage extends EPackage {
 	int PANNOTATED_EREFERENCE__COLUMN = PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN;
 
 	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_EREFERENCE__PARSED_ATTRIBUTE_OVERRIDES = PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PANNOTATED_EREFERENCE__PARSED_JOIN_COLUMNS = PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS;
+
+	/**
 	 * The feature id for the '<em><b>Annotated EReference</b></em>' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -1038,7 +1101,8 @@ public interface PamodelPackage extends EPackage {
 
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage#getSequenceGenerator <em>Sequence Generator</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Sequence Generator</em>'.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage#getSequenceGenerator()
 	 * @see #getPAnnotatedEPackage()
@@ -1196,16 +1260,6 @@ public interface PamodelPackage extends EPackage {
 	EReference getPAnnotatedEClass_SecondaryTables();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getSequenceGenerator <em>Sequence Generator</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Sequence Generator</em>'.
-	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getSequenceGenerator()
-	 * @see #getPAnnotatedEClass()
-	 * @generated
-	 */
-	EReference getPAnnotatedEClass_SequenceGenerator();
-
-	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getTable <em>Table</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Table</em>'.
@@ -1236,6 +1290,28 @@ public interface PamodelPackage extends EPackage {
 	EReference getPAnnotatedEClass_AssociationOverrides();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getParsedAttributeOverrides <em>Parsed Attribute Overrides</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Parsed Attribute Overrides</em>'.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getParsedAttributeOverrides()
+	 * @see #getPAnnotatedEClass()
+	 * @generated
+	 */
+	EReference getPAnnotatedEClass_ParsedAttributeOverrides();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getParsedAssociationOverrides <em>Parsed Association Overrides</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Parsed Association Overrides</em>'.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass#getParsedAssociationOverrides()
+	 * @see #getPAnnotatedEClass()
+	 * @generated
+	 */
+	EReference getPAnnotatedEClass_ParsedAssociationOverrides();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature <em>PAnnotated EStructural Feature</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>PAnnotated EStructural Feature</em>'.
@@ -1356,6 +1432,28 @@ public interface PamodelPackage extends EPackage {
 	EReference getPAnnotatedEStructuralFeature_Column();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getParsedAttributeOverrides <em>Parsed Attribute Overrides</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Parsed Attribute Overrides</em>'.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getParsedAttributeOverrides()
+	 * @see #getPAnnotatedEStructuralFeature()
+	 * @generated
+	 */
+	EReference getPAnnotatedEStructuralFeature_ParsedAttributeOverrides();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getParsedJoinColumns <em>Parsed Join Columns</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Parsed Join Columns</em>'.
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getParsedJoinColumns()
+	 * @see #getPAnnotatedEStructuralFeature()
+	 * @generated
+	 */
+	EReference getPAnnotatedEStructuralFeature_ParsedJoinColumns();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute <em>PAnnotated EAttribute</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>PAnnotated EAttribute</em>'.
@@ -1773,14 +1871,6 @@ public interface PamodelPackage extends EPackage {
 		EReference PANNOTATED_ECLASS__SECONDARY_TABLES = eINSTANCE.getPAnnotatedEClass_SecondaryTables();
 
 		/**
-		 * The meta object literal for the '<em><b>Sequence Generator</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PANNOTATED_ECLASS__SEQUENCE_GENERATOR = eINSTANCE.getPAnnotatedEClass_SequenceGenerator();
-
-		/**
 		 * The meta object literal for the '<em><b>Table</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1805,6 +1895,22 @@ public interface PamodelPackage extends EPackage {
 		EReference PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES = eINSTANCE.getPAnnotatedEClass_AssociationOverrides();
 
 		/**
+		 * The meta object literal for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES = eINSTANCE.getPAnnotatedEClass_ParsedAttributeOverrides();
+
+		/**
+		 * The meta object literal for the '<em><b>Parsed Association Overrides</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES = eINSTANCE.getPAnnotatedEClass_ParsedAssociationOverrides();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl <em>PAnnotated EStructural Feature</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1903,6 +2009,22 @@ public interface PamodelPackage extends EPackage {
 		EReference PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN = eINSTANCE.getPAnnotatedEStructuralFeature_Column();
 
 		/**
+		 * The meta object literal for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES = eINSTANCE.getPAnnotatedEStructuralFeature_ParsedAttributeOverrides();
+
+		/**
+		 * The meta object literal for the '<em><b>Parsed Join Columns</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS = eINSTANCE.getPAnnotatedEStructuralFeature_ParsedJoinColumns();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEAttributeImpl <em>PAnnotated EAttribute</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEClassImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEClassImpl.java
index e4d810512..36132cc84 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEClassImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEClassImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedEClassImpl.java,v 1.3 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PAnnotatedEClassImpl.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
@@ -27,7 +28,9 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
 import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
+import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverrides;
+import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.DiscriminatorColumn;
 import org.eclipse.emf.teneo.annotations.pannotation.DiscriminatorValue;
@@ -37,9 +40,9 @@ import org.eclipse.emf.teneo.annotations.pannotation.IdClass;
 import org.eclipse.emf.teneo.annotations.pannotation.Inheritance;
 import org.eclipse.emf.teneo.annotations.pannotation.InheritanceType;
 import org.eclipse.emf.teneo.annotations.pannotation.MappedSuperclass;
+import org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory;
 import org.eclipse.emf.teneo.annotations.pannotation.PrimaryKeyJoinColumns;
 import org.eclipse.emf.teneo.annotations.pannotation.SecondaryTables;
-import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
 import org.eclipse.emf.teneo.annotations.pannotation.Table;
 import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
 
@@ -63,10 +66,11 @@ import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getInheritance <em>Inheritance</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getSecondaryTables <em>Secondary Tables</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getSequenceGenerator <em>Sequence Generator</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getTable <em>Table</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getTableGenerator <em>Table Generator</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getAssociationOverrides <em>Association Overrides</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getParsedAttributeOverrides <em>Parsed Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl#getParsedAssociationOverrides <em>Parsed Association Overrides</em>}</li>
  * </ul>
  * </p>
  *
@@ -201,16 +205,6 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 	protected SecondaryTables secondaryTables = null;
 
 	/**
-	 * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected SequenceGenerator sequenceGenerator = null;
-
-	/**
 	 * The cached value of the '{@link #getTable() <em>Table</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -241,6 +235,26 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 	protected AssociationOverrides associationOverrides = null;
 
 	/**
+	 * The cached value of the '{@link #getParsedAttributeOverrides() <em>Parsed Attribute Overrides</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParsedAttributeOverrides()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList parsedAttributeOverrides = null;
+
+	/**
+	 * The cached value of the '{@link #getParsedAssociationOverrides() <em>Parsed Association Overrides</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParsedAssociationOverrides()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList parsedAssociationOverrides = null;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -794,49 +808,6 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SequenceGenerator getSequenceGenerator() {
-		return sequenceGenerator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSequenceGenerator(SequenceGenerator newSequenceGenerator, NotificationChain msgs) {
-		SequenceGenerator oldSequenceGenerator = sequenceGenerator;
-		sequenceGenerator = newSequenceGenerator;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR, oldSequenceGenerator, newSequenceGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSequenceGenerator(SequenceGenerator newSequenceGenerator) {
-		if (newSequenceGenerator != sequenceGenerator) {
-			NotificationChain msgs = null;
-			if (sequenceGenerator != null)
-				msgs = ((InternalEObject)sequenceGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR, null, msgs);
-			if (newSequenceGenerator != null)
-				msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR, null, msgs);
-			msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR, newSequenceGenerator, newSequenceGenerator));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public Table getTable() {
 		return table;
 	}
@@ -964,6 +935,32 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EList getParsedAttributeOverrides() {
+		if (attributeOverrides == null) {
+			attributeOverrides = PannotationFactory.eINSTANCE.createAttributeOverrides();
+		}
+		parsedAttributeOverrides = attributeOverrides.getValue();
+		return parsedAttributeOverrides;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EList getParsedAssociationOverrides() {
+		if (associationOverrides == null) {
+			associationOverrides = PannotationFactory.eINSTANCE.createAssociationOverrides();
+		}
+		parsedAssociationOverrides = associationOverrides.getValue();
+		return parsedAssociationOverrides;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -1009,14 +1006,16 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 				return basicSetPrimaryKeyJoinColumns(null, msgs);
 			case PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES:
 				return basicSetSecondaryTables(null, msgs);
-			case PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR:
-				return basicSetSequenceGenerator(null, msgs);
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE:
 				return basicSetTable(null, msgs);
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE_GENERATOR:
 				return basicSetTableGenerator(null, msgs);
 			case PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES:
 				return basicSetAssociationOverrides(null, msgs);
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES:
+				return ((InternalEList)getParsedAttributeOverrides()).basicRemove(otherEnd, msgs);
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES:
+				return ((InternalEList)getParsedAssociationOverrides()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -1068,14 +1067,16 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 				return getPrimaryKeyJoinColumns();
 			case PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES:
 				return getSecondaryTables();
-			case PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR:
-				return getSequenceGenerator();
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE:
 				return getTable();
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE_GENERATOR:
 				return getTableGenerator();
 			case PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES:
 				return getAssociationOverrides();
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES:
+				return getParsedAttributeOverrides();
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES:
+				return getParsedAssociationOverrides();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1127,9 +1128,6 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 			case PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES:
 				setSecondaryTables((SecondaryTables)newValue);
 				return;
-			case PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR:
-				setSequenceGenerator((SequenceGenerator)newValue);
-				return;
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE:
 				setTable((Table)newValue);
 				return;
@@ -1139,6 +1137,14 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 			case PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES:
 				setAssociationOverrides((AssociationOverrides)newValue);
 				return;
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES:
+				getParsedAttributeOverrides().clear();
+				getParsedAttributeOverrides().addAll((Collection)newValue);
+				return;
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES:
+				getParsedAssociationOverrides().clear();
+				getParsedAssociationOverrides().addAll((Collection)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1189,9 +1195,6 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 			case PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES:
 				setSecondaryTables((SecondaryTables)null);
 				return;
-			case PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR:
-				setSequenceGenerator((SequenceGenerator)null);
-				return;
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE:
 				setTable((Table)null);
 				return;
@@ -1201,6 +1204,12 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 			case PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES:
 				setAssociationOverrides((AssociationOverrides)null);
 				return;
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES:
+				getParsedAttributeOverrides().clear();
+				return;
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES:
+				getParsedAssociationOverrides().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1238,14 +1247,16 @@ public class PAnnotatedEClassImpl extends PAnnotatedEModelElementImpl implements
 				return primaryKeyJoinColumns != null;
 			case PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES:
 				return secondaryTables != null;
-			case PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR:
-				return sequenceGenerator != null;
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE:
 				return table != null;
 			case PamodelPackage.PANNOTATED_ECLASS__TABLE_GENERATOR:
 				return tableGenerator != null;
 			case PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES:
 				return associationOverrides != null;
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES:
+				return parsedAttributeOverrides != null && !parsedAttributeOverrides.isEmpty();
+			case PamodelPackage.PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES:
+				return parsedAssociationOverrides != null && !parsedAssociationOverrides.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEPackageImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEPackageImpl.java
index 88712c457..21d399a0c 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedEPackageImpl.java,v 1.3 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PAnnotatedEPackageImpl.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEStructuralFeatureImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEStructuralFeatureImpl.java
index 09f248013..69aa71378 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEStructuralFeatureImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedEStructuralFeatureImpl.java
@@ -2,22 +2,30 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedEStructuralFeatureImpl.java,v 1.4 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PAnnotatedEStructuralFeatureImpl.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
 import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
+import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.Column;
 import org.eclipse.emf.teneo.annotations.pannotation.Indexed;
@@ -25,6 +33,7 @@ import org.eclipse.emf.teneo.annotations.pannotation.JoinColumn;
 import org.eclipse.emf.teneo.annotations.pannotation.JoinColumns;
 import org.eclipse.emf.teneo.annotations.pannotation.JoinTable;
 import org.eclipse.emf.teneo.annotations.pannotation.OneToMany;
+import org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory;
 import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
 import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
 import org.eclipse.emf.teneo.annotations.pannotation.Unique;
@@ -46,6 +55,8 @@ import org.eclipse.emf.teneo.annotations.pannotation.Unique;
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl#getIndexed <em>Indexed</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl#getUnique <em>Unique</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl#getColumn <em>Column</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl#getParsedAttributeOverrides <em>Parsed Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEStructuralFeatureImpl#getParsedJoinColumns <em>Parsed Join Columns</em>}</li>
  * </ul>
  * </p>
  *
@@ -148,6 +159,26 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 	protected Column column = null;
 
 	/**
+	 * The cached value of the '{@link #getParsedAttributeOverrides() <em>Parsed Attribute Overrides</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParsedAttributeOverrides()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList parsedAttributeOverrides = null;
+
+	/**
+	 * The cached value of the '{@link #getParsedJoinColumns() <em>Parsed Join Columns</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParsedJoinColumns()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList parsedJoinColumns = null;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -595,6 +626,10 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 				return basicSetUnique(null, msgs);
 			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN:
 				return basicSetColumn(null, msgs);
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES:
+				return ((InternalEList)getParsedAttributeOverrides()).basicRemove(otherEnd, msgs);
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS:
+				return ((InternalEList)getParsedJoinColumns()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -642,6 +677,10 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 				return getUnique();
 			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN:
 				return getColumn();
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES:
+				return getParsedAttributeOverrides();
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS:
+				return getParsedJoinColumns();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -686,6 +725,14 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN:
 				setColumn((Column)newValue);
 				return;
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES:
+				getParsedAttributeOverrides().clear();
+				getParsedAttributeOverrides().addAll((Collection)newValue);
+				return;
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS:
+				getParsedJoinColumns().clear();
+				getParsedJoinColumns().addAll((Collection)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -730,6 +777,12 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN:
 				setColumn((Column)null);
 				return;
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES:
+				getParsedAttributeOverrides().clear();
+				return;
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS:
+				getParsedJoinColumns().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -763,6 +816,10 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 				return unique != null;
 			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN:
 				return column != null;
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES:
+				return parsedAttributeOverrides != null && !parsedAttributeOverrides.isEmpty();
+			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS:
+				return parsedJoinColumns != null && !parsedJoinColumns.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -823,4 +880,30 @@ public abstract class PAnnotatedEStructuralFeatureImpl extends PAnnotatedEModelE
 			eNotify(new ENotificationImpl(this, Notification.SET, PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN, newColumn, newColumn));
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EList getParsedAttributeOverrides() {
+		if (attributeOverrides == null) {
+			attributeOverrides = PannotationFactory.eINSTANCE.createAttributeOverrides();
+		}
+		parsedAttributeOverrides = attributeOverrides.getValue();
+		return parsedAttributeOverrides;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EList getParsedJoinColumns() {
+		if (joinColumns == null) {
+			joinColumns = PannotationFactory.eINSTANCE.createJoinColumns();
+		}
+		parsedJoinColumns = joinColumns.getValue();
+		return parsedJoinColumns;
+	}
+
 } // PAnnotatedEStructuralFeatureImpl
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java
index 786b80817..e7f6b2b24 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedModelImpl.java,v 1.3 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PAnnotatedModelImpl.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
@@ -43,9 +43,8 @@ import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
 import org.eclipse.emf.teneo.annotations.processing.ProcessingException;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>PAnnotated Model</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>PAnnotated Model</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -56,9 +55,9 @@ import org.eclipse.emf.teneo.annotations.processing.ProcessingException;
  * @generated
  */
 public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel {
+
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Davide Marchignoli\n";
@@ -110,9 +109,9 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	final MapTrackingAdapter itsMapTrackingAdapter;
 
 	/**
-	 * The cached value of the '{@link #getPaEPackages() <em>Pa EPackages</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPaEPackages() <em>Pa EPackages</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPaEPackages()
 	 * @generated
 	 * @ordered
@@ -120,14 +119,14 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	protected EList paEPackages = null;
 
 	/**
-	 * Record the association between the EModelElement and the PAnnotatedEModelElement
-	 * that are contained in this PAnnotatedModel content.
+	 * Record the association between the EModelElement and the PAnnotatedEModelElement that are contained in this
+	 * PAnnotatedModel content.
 	 */
 	protected final Map eElement_to_pElement;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	protected PAnnotatedModelImpl() {
@@ -137,14 +136,13 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * Register the association among a PAnnotatedEModelElement and its
-	 * annotated EModelElement. If another PAnnotatedEModelElement 
-	 * was associatied to the same EModelElement, such association will be broken.
+	 * Register the association among a PAnnotatedEModelElement and its annotated EModelElement. If another
+	 * PAnnotatedEModelElement was associatied to the same EModelElement, such association will be broken.
 	 * 
-	 * <p>In order to mantain the consistency of the model, whenever an 
-	 * association among a PAnnotatedEModelElement <code>pa</code> and 
-	 * an EModelElement <code>e</code> is broken, the annotatedElement feature
-	 * of <code>pa</code> is unset. 
+	 * <p>
+	 * In order to mantain the consistency of the model, whenever an association among a PAnnotatedEModelElement
+	 * <code>pa</code> and an EModelElement <code>e</code> is broken, the annotatedElement feature of
+	 * <code>pa</code> is unset.
 	 */
 	protected void addMapping(PAnnotatedEModelElement target) {
 		final EModelElement eModelElement  = target.getAnnotatedElement();
@@ -159,9 +157,8 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * Unregister the association between an <code>EModelElement</code> and
-	 * the <code>PAnnotatedEModelElement</code> that references it via the
-	 * <code>annotatedElement</code> feature.
+	 * Unregister the association between an <code>EModelElement</code> and the <code>PAnnotatedEModelElement</code>
+	 * that references it via the <code>annotatedElement</code> feature.
 	 */
 	protected void removeMapping(EModelElement eModelElement) {
 		final Object prevAssoc = eElement_to_pElement.remove(eModelElement); 
@@ -169,8 +166,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * Invoked whenever a new PAnnotatedEModelElement is added to the
-	 * PAnnotatedModel.
+	 * Invoked whenever a new PAnnotatedEModelElement is added to the PAnnotatedModel.
 	 */
 	protected void attach(PAnnotatedEModelElement aElement) {
 		aElement.eAdapters().add(0, itsMapTrackingAdapter);
@@ -179,8 +175,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * Invoked whenever a set of new PAnnotatedEModelElement is added to the
-	 * PAnnotatedModel.
+	 * Invoked whenever a set of new PAnnotatedEModelElement is added to the PAnnotatedModel.
 	 */
 	protected void attach(List aElements) {
 		for (Iterator i = aElements.iterator(); i.hasNext(); ) {
@@ -191,8 +186,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 	
 	/**
-	 * Invoked whenever a PAnnotatedEModelElement is removed from the
-	 * PAnnotatedModel.
+	 * Invoked whenever a PAnnotatedEModelElement is removed from the PAnnotatedModel.
 	 */
 	protected void detach(PAnnotatedEModelElement aElement) {
 		aElement.eAdapters().remove(itsMapTrackingAdapter);
@@ -203,8 +197,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * Invoked whenever a set of PAnnotatedEModelElement is removed from the
-	 * PAnnotatedModel.
+	 * Invoked whenever a set of PAnnotatedEModelElement is removed from the PAnnotatedModel.
 	 */
 	protected void detach(List aElements) {
 		for (Iterator i = aElements.iterator(); i.hasNext(); ) {
@@ -215,10 +208,9 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 	
 	/**
-	 * Invariant: the eElement_to_pElement map agree with the PAnnotatedModel
-	 * content.
-	 * <p>This method should be used only for debugging.
-	 * TODO use in validation.
+	 * Invariant: the eElement_to_pElement map agree with the PAnnotatedModel content.
+	 * <p>
+	 * This method should be used only for debugging. TODO use in validation.
 	 */
 	public void invMapIsWellFormed() {
 		Set definedUnused = new HashSet(eElement_to_pElement.keySet()); 
@@ -238,62 +230,55 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 	
 	/**
-	 * @return Returns the unique <code>PAnnotatedEModelElement</code>
-	 * associated (via the <code>annotatedElement</code> feature) to the
-	 * given <code>EModelElement</code>.
+	 * @return Returns the unique <code>PAnnotatedEModelElement</code> associated (via the
+	 *         <code>annotatedElement</code> feature) to the given <code>EModelElement</code>.
 	 */
 	public PAnnotatedEModelElement getPAnnotated(EModelElement e) {
 		return (PAnnotatedEModelElement) eElement_to_pElement.get(e);
 	}
 
 	/**
-	 * @return Returns the unique <code>PAnnotatedEPackage</code>
-	 * associated (via the <code>annotatedElement</code> feature) to the
-	 * given <code>EPackage</code>.
+	 * @return Returns the unique <code>PAnnotatedEPackage</code> associated (via the <code>annotatedElement</code>
+	 *         feature) to the given <code>EPackage</code>.
 	 */
 	public PAnnotatedEPackage getPAnnotated(EPackage e) {
 		return (PAnnotatedEPackage) eElement_to_pElement.get(e);
 	}
 
 	/**
-	 * @return Returns the unique <code>PAnnotatedEClass</code>
-	 * associated (via the <code>annotatedElement</code> feature) to the
-	 * given <code>EClass</code>.
+	 * @return Returns the unique <code>PAnnotatedEClass</code> associated (via the <code>annotatedElement</code>
+	 *         feature) to the given <code>EClass</code>.
 	 */
 	public PAnnotatedEClass getPAnnotated(EClass e) {
 		return (PAnnotatedEClass) eElement_to_pElement.get(e);
 	}
 
 	/**
-	 * @return Returns the unique <code>PAnnotatedEStructuralFeature</code>
-	 * associated (via the <code>annotatedElement</code> feature) to the
-	 * given <code>EStructuralFeature</code>.
+	 * @return Returns the unique <code>PAnnotatedEStructuralFeature</code> associated (via the
+	 *         <code>annotatedElement</code> feature) to the given <code>EStructuralFeature</code>.
 	 */
 	public PAnnotatedEStructuralFeature getPAnnotated(EStructuralFeature e) {
 		return (PAnnotatedEStructuralFeature) eElement_to_pElement.get(e);
 	}
 
 	/**
-	 * @return Returns the unique <code>PAnnotatedEAttribute</code>
-	 * associated (via the <code>annotatedElement</code> feature) to the
-	 * given <code>EAttribute</code>.
+	 * @return Returns the unique <code>PAnnotatedEAttribute</code> associated (via the <code>annotatedElement</code>
+	 *         feature) to the given <code>EAttribute</code>.
 	 */
 	public PAnnotatedEAttribute getPAnnotated(EAttribute e) {
 		return (PAnnotatedEAttribute) eElement_to_pElement.get(e);
 	}
 
 	/**
-	 * @return Returns the unique <code>PAnnotatedEReference</code>
-	 * associated (via the <code>annotatedElement</code> feature) to the
-	 * given <code>EReference</code>.
+	 * @return Returns the unique <code>PAnnotatedEReference</code> associated (via the <code>annotatedElement</code>
+	 *         feature) to the given <code>EReference</code>.
 	 */
 	public PAnnotatedEReference getPAnnotated(EReference e) {
 		return (PAnnotatedEReference) eElement_to_pElement.get(e);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected EClass eStaticClass() {
@@ -301,8 +286,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList getPaEPackages() {
@@ -313,8 +297,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -326,8 +309,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -339,8 +321,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
@@ -352,8 +333,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public void eSet(int featureID, Object newValue) {
@@ -367,8 +347,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public void eUnset(int featureID) {
@@ -381,8 +360,7 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public boolean eIsSet(int featureID) {
@@ -393,18 +371,20 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 		return super.eIsSet(featureID);
 	}
 
-	/** Returns a sequence generator on the basis of its name, if not found then an exception is thrown.
-	 * efeature is passed for debugging purposes. */
+	/**
+	 * Returns a sequence generator on the basis of its name, if not found then an exception is thrown. efeature is
+	 * passed for debugging purposes.
+	 */
 	public SequenceGenerator getSequenceGenerator(EStructuralFeature efeature, String name) {
 		for (Iterator it = getPaEPackages().iterator(); it.hasNext();) {
 			final PAnnotatedEPackage pae = (PAnnotatedEPackage)it.next();
-			if (pae.getSequenceGenerator() != null && pae.getSequenceGenerator().getName() != null &&
-					pae.getSequenceGenerator().getName().compareTo(name) == 0) {
-				return pae.getSequenceGenerator();
+			final SequenceGenerator sg = pae.getSequenceGenerator();
+			if (sg.getName() != null && sg.getName().compareTo(name) == 0) {
+				return sg;
 			}
 		}
 		throw new ProcessingException("No sequence generator found with the name: " + name + ", name is used in " +
 				"annotation of element " + efeature.getEContainingClass().getName() + "/" + efeature.getName());
 	}
 	
-} //PAnnotatedModelImpl
+} // PAnnotatedModelImpl
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java
index 99447d81e..8c19542b7 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PamodelFactoryImpl.java,v 1.4 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PamodelFactoryImpl.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
@@ -11,6 +11,8 @@ 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.annotations.pamodel.*;
+
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelPackageImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelPackageImpl.java
index ac370e9f3..421ef96ab 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PamodelPackageImpl.java,v 1.4 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PamodelPackageImpl.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
@@ -401,7 +401,7 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPAnnotatedEClass_SequenceGenerator() {
+	public EReference getPAnnotatedEClass_Table() {
 		return (EReference)pAnnotatedEClassEClass.getEStructuralFeatures().get(13);
 	}
 
@@ -410,7 +410,7 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPAnnotatedEClass_Table() {
+	public EReference getPAnnotatedEClass_TableGenerator() {
 		return (EReference)pAnnotatedEClassEClass.getEStructuralFeatures().get(14);
 	}
 
@@ -419,7 +419,7 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPAnnotatedEClass_TableGenerator() {
+	public EReference getPAnnotatedEClass_AssociationOverrides() {
 		return (EReference)pAnnotatedEClassEClass.getEStructuralFeatures().get(15);
 	}
 
@@ -428,7 +428,7 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPAnnotatedEClass_AssociationOverrides() {
+	public EReference getPAnnotatedEClass_ParsedAttributeOverrides() {
 		return (EReference)pAnnotatedEClassEClass.getEStructuralFeatures().get(16);
 	}
 
@@ -437,6 +437,15 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getPAnnotatedEClass_ParsedAssociationOverrides() {
+		return (EReference)pAnnotatedEClassEClass.getEStructuralFeatures().get(17);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getPAnnotatedEStructuralFeature() {
 		return pAnnotatedEStructuralFeatureEClass;
 	}
@@ -545,6 +554,24 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getPAnnotatedEStructuralFeature_ParsedAttributeOverrides() {
+		return (EReference)pAnnotatedEStructuralFeatureEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getPAnnotatedEStructuralFeature_ParsedJoinColumns() {
+		return (EReference)pAnnotatedEStructuralFeatureEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getPAnnotatedEAttribute() {
 		return pAnnotatedEAttributeEClass;
 	}
@@ -767,10 +794,11 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__INHERITANCE);
 		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__PRIMARY_KEY_JOIN_COLUMNS);
 		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__SECONDARY_TABLES);
-		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__SEQUENCE_GENERATOR);
 		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__TABLE);
 		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__TABLE_GENERATOR);
 		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES);
+		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES);
+		createEReference(pAnnotatedEClassEClass, PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES);
 
 		pAnnotatedEStructuralFeatureEClass = createEClass(PANNOTATED_ESTRUCTURAL_FEATURE);
 		createEReference(pAnnotatedEStructuralFeatureEClass, PANNOTATED_ESTRUCTURAL_FEATURE__PA_ECLASS);
@@ -784,6 +812,8 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 		createEReference(pAnnotatedEStructuralFeatureEClass, PANNOTATED_ESTRUCTURAL_FEATURE__INDEXED);
 		createEReference(pAnnotatedEStructuralFeatureEClass, PANNOTATED_ESTRUCTURAL_FEATURE__UNIQUE);
 		createEReference(pAnnotatedEStructuralFeatureEClass, PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN);
+		createEReference(pAnnotatedEStructuralFeatureEClass, PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES);
+		createEReference(pAnnotatedEStructuralFeatureEClass, PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS);
 
 		pAnnotatedEAttributeEClass = createEClass(PANNOTATED_EATTRIBUTE);
 		createEReference(pAnnotatedEAttributeEClass, PANNOTATED_EATTRIBUTE__ANNOTATED_EATTRIBUTE);
@@ -869,10 +899,11 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 		initEReference(getPAnnotatedEClass_Inheritance(), thePannotationPackage.getInheritance(), null, "inheritance", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEClass_PrimaryKeyJoinColumns(), thePannotationPackage.getPrimaryKeyJoinColumns(), null, "primaryKeyJoinColumns", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEClass_SecondaryTables(), thePannotationPackage.getSecondaryTables(), null, "secondaryTables", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPAnnotatedEClass_SequenceGenerator(), thePannotationPackage.getSequenceGenerator(), null, "sequenceGenerator", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEClass_Table(), thePannotationPackage.getTable(), null, "table", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEClass_TableGenerator(), thePannotationPackage.getTableGenerator(), null, "tableGenerator", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEClass_AssociationOverrides(), thePannotationPackage.getAssociationOverrides(), null, "associationOverrides", null, 0, 1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPAnnotatedEClass_ParsedAttributeOverrides(), thePannotationPackage.getAttributeOverride(), null, "parsedAttributeOverrides", null, 0, -1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPAnnotatedEClass_ParsedAssociationOverrides(), thePannotationPackage.getAssociationOverride(), null, "parsedAssociationOverrides", null, 0, -1, PAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(pAnnotatedEStructuralFeatureEClass, PAnnotatedEStructuralFeature.class, "PAnnotatedEStructuralFeature", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPAnnotatedEStructuralFeature_PaEClass(), this.getPAnnotatedEClass(), this.getPAnnotatedEClass_PaEStructuralFeatures(), "paEClass", null, 0, 1, PAnnotatedEStructuralFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -886,6 +917,8 @@ public class PamodelPackageImpl extends EPackageImpl implements PamodelPackage {
 		initEReference(getPAnnotatedEStructuralFeature_Indexed(), thePannotationPackage.getIndexed(), null, "indexed", null, 0, 1, PAnnotatedEStructuralFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEStructuralFeature_Unique(), thePannotationPackage.getUnique(), null, "unique", null, 0, 1, PAnnotatedEStructuralFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPAnnotatedEStructuralFeature_Column(), thePannotationPackage.getColumn(), null, "column", null, 0, 1, PAnnotatedEStructuralFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPAnnotatedEStructuralFeature_ParsedAttributeOverrides(), thePannotationPackage.getAttributeOverride(), null, "parsedAttributeOverrides", null, 0, -1, PAnnotatedEStructuralFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPAnnotatedEStructuralFeature_ParsedJoinColumns(), thePannotationPackage.getJoinColumn(), null, "parsedJoinColumns", null, 0, -1, PAnnotatedEStructuralFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(pAnnotatedEAttributeEClass, PAnnotatedEAttribute.class, "PAnnotatedEAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPAnnotatedEAttribute_AnnotatedEAttribute(), ecorePackage.getEAttribute(), null, "annotatedEAttribute", null, 1, 1, PAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/BasicPamodelBuilder.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/BasicPamodelBuilder.java
index 0898a5da6..b4f293d17 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/BasicPamodelBuilder.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/BasicPamodelBuilder.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: BasicPamodelBuilder.java,v 1.3 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: BasicPamodelBuilder.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 
 
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
@@ -33,8 +32,6 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
 import org.eclipse.emf.teneo.annotations.pamodel.PamodelFactory;
-import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
-import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
 
 /**
  * Convience class for building a <code>PAnnotatedModel</code>.
@@ -230,7 +227,6 @@ public class BasicPamodelBuilder {
 	 * Add the given annotation to the given PAnnotatedEModelElement.
 	 * @throws IllegalArgumentException if the given PAnnotation
 	 * is not admitted for the given PAnnotatedEModelElement.
-	 */
 	protected void setPAnnotation(PAnnotatedEModelElement pElement, PAnnotation pAnnotation) {
 		EReference pAnnotationRef = PamodelPackage.eINSTANCE.pAnnotationReference(pElement.eClass(), pAnnotation.eClass());
 		if (pAnnotationRef == null)
@@ -238,6 +234,7 @@ public class BasicPamodelBuilder {
 					+ "' does not apply to elements of type '" + pElement.eClass() + "'");
 		pElement.eSet(pAnnotationRef, pAnnotation);
 	}
+	 */
 	
 	/**
 	 * Add the given PAnnotation to the target model.
@@ -248,11 +245,11 @@ public class BasicPamodelBuilder {
 	 * <code>pAnnotation.getEModelElement()</code> are null.
 	 * @throws IllegalArgumentException if the given <code>PAnnotation</code>
 	 * references an invalid <code>PAnnotatedElement</code>
-	 */
 	public void add(PAnnotation pAnnotation) {
 		PAnnotatedEModelElement pElement = pElement(pAnnotation.getEModelElement());
 		setPAnnotation(pElement, pAnnotation);
 	}
+	 */
 
 	/**
 	 * Add to the the target model a new PAnnotatedPackage refering
@@ -299,10 +296,10 @@ public class BasicPamodelBuilder {
 	 * 
 	 * <p>Elements for which a corresponding PAnnotatedElement is 
 	 * already present in the target model are ignored.  
-	 */
 	public void addRecurse(EClass eClass) {
 		addRecurse((PAnnotatedEPackage) pElement(eClass), eClass);
 	}
+	 */
 
 	/**
 	 * used by {@link #addRecurse(EClass)} to avoid recomputing the
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/EannotationPamodelBuilder.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/EannotationPamodelBuilder.java
index 8eac7d7a9..8559106ec 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/EannotationPamodelBuilder.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/EannotationPamodelBuilder.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: EannotationPamodelBuilder.java,v 1.3 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: EannotationPamodelBuilder.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.pamodel.util;
@@ -25,9 +25,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
+import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
 import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
 import org.eclipse.emf.teneo.annotations.pannotation.util.EAnnotationImporter;
 
@@ -118,6 +120,19 @@ public class EannotationPamodelBuilder extends BasicPamodelBuilder {
 	}
 	
 	/**
+	 * Add the given annotation to the given PAnnotatedEModelElement.
+	 * @throws IllegalArgumentException if the given PAnnotation
+	 * is not admitted for the given PAnnotatedEModelElement.
+	 */
+	protected void setPAnnotation(PAnnotatedEModelElement pElement, PAnnotation pAnnotation) {
+		EReference pAnnotationRef = PamodelPackage.eINSTANCE.pAnnotationReference(pElement.eClass(), pAnnotation.eClass());
+		if (pAnnotationRef == null)
+			throw new IllegalArgumentException("PAnnotation of type '" + pAnnotation.eClass() 
+					+ "' does not apply to elements of type '" + pElement.eClass() + "'");
+		pElement.eSet(pAnnotationRef, pAnnotation);
+	}
+
+	/**
 	 * Interpret the EAnnotation of the given EModelElement as PAnnotation
 	 * ({@see org.eclipse.emf.teneo.annotations.pannotation.util.EAnnotationImporter})
 	 * and add them to the model.
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java
index 8de8845b7..f29ea747f 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PamodelAdapterFactory.java,v 1.4 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PamodelAdapterFactory.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.util;
 
@@ -10,6 +10,8 @@ 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.annotations.pamodel.*;
+
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java
index a59cb5575..3843dc746 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PamodelSwitch.java,v 1.4 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PamodelSwitch.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.util;
 
@@ -10,6 +10,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.teneo.annotations.pamodel.*;
+
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java
index c5f9347b8..95dd595a1 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PamodelValidator.java,v 1.4 2006/07/26 12:43:36 mtaal Exp $
+ * $Id: PamodelValidator.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.util;
 
@@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.teneo.annotations.pamodel.*;
+
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/JoinColumns.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/JoinColumns.java
index 641c1c8c0..8c12a473f 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/JoinColumns.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/JoinColumns.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JoinColumns.java,v 1.2 2006/07/04 21:56:28 mtaal Exp $
+ * $Id: JoinColumns.java,v 1.3 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation;
 
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
  * @model annotation="http://annotation.elver.org/internal/Target 0='EReference'"
  * @generated
  */
-public interface JoinColumns extends PAnnotation{
+public interface JoinColumns extends PAnnotation {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/PannotationPackage.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/PannotationPackage.java
index f709a13da..d1f3f0a79 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/PannotationPackage.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/PannotationPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PannotationPackage.java,v 1.4 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PannotationPackage.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation;
 
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EReference;
  * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap Target='http://annotation.elver.org/internal/Target' Unsupported='http://annotation.elver.org/internal/Unsupported'"
+ *        annotation="teneo.mapping.source 0='http://annotation.elver.org/' 1='http://ejb.elver.org/'"
  * @generated
  */
 public interface PannotationPackage extends EPackage {
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/Parameter.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/Parameter.java
deleted file mode 100644
index 28bc81fb4..000000000
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/Parameter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Parameter.java,v 1.3 2006/08/24 22:12:35 mtaal Exp $
- */
-package org.eclipse.emf.teneo.annotations.pannotation;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.emf.teneo.annotations.pannotation.Parameter#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.annotations.pannotation.Parameter#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getParameter()
- * @model
- * @generated
- */
-public interface Parameter extends EObject {
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Davide Marchignoli\n";
-
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-     * @see #setName(String)
-     * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getParameter_Name()
-     * @model required="true"
-     * @generated
-     */
-	String getName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.emf.teneo.annotations.pannotation.Parameter#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-	void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-     * @return the value of the '<em>Value</em>' attribute.
-     * @see #setValue(String)
-     * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getParameter_Value()
-     * @model required="true"
-     * @generated
-     */
-	String getValue();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.emf.teneo.annotations.pannotation.Parameter#getValue <em>Value</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Value</em>' attribute.
-     * @see #getValue()
-     * @generated
-     */
-	void setValue(String value);
-
-} // Parameter
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceGenerator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceGenerator.java
index 73e0f8fc4..aeaf6d1d3 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceGenerator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/SequenceGenerator.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SequenceGenerator.java,v 1.2 2006/07/04 21:56:29 mtaal Exp $
+ * $Id: SequenceGenerator.java,v 1.3 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation;
 
@@ -24,7 +24,7 @@ package org.eclipse.emf.teneo.annotations.pannotation;
  * @model annotation="http://annotation.elver.org/internal/Target 0='EClass' 1='EStructuralFeature' 2='EPackage'"
  * @generated
  */
-public interface SequenceGenerator extends PAnnotation{
+public interface SequenceGenerator extends PAnnotation {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/Type.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/Type.java
deleted file mode 100644
index 1f972c99e..000000000
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/Type.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Type.java,v 1.3 2006/08/24 22:12:35 mtaal Exp $
- */
-package org.eclipse.emf.teneo.annotations.pannotation;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Type</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.emf.teneo.annotations.pannotation.Type#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.annotations.pannotation.Type#getParameters <em>Parameters</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getType()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EAttribute'"
- * @generated
- */
-public interface Type extends PAnnotation {
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Davide Marchignoli\n";
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(String)
-     * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getType_Type()
-     * @model required="true"
-     * @generated
-     */
-	String getType();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.emf.teneo.annotations.pannotation.Type#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-	void setType(String value);
-
-    /**
-     * Returns the value of the '<em><b>Parameters</b></em>' reference list.
-     * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Parameter}.
-     * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameters</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>Parameters</em>' reference list.
-     * @see org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage#getType_Parameters()
-     * @model type="org.eclipse.emf.teneo.annotations.pannotation.Parameter"
-     * @generated
-     */
-	EList getParameters();
-
-} // Type
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java
index a47a6493e..b73b0e3df 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PannotationFactoryImpl.java,v 1.5 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PannotationFactoryImpl.java,v 1.6 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation.impl;
 
@@ -12,6 +12,8 @@ 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.annotations.pannotation.*;
+
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java
index d157895f4..5bb71c8ae 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PannotationPackageImpl.java,v 1.4 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PannotationPackageImpl.java,v 1.5 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation.impl;
 
@@ -2329,6 +2329,8 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 		// Create annotations
 		// http://www.eclipse.org/emf/2004/EmfaticAnnotationMap
 		createEmfaticAnnotationMapAnnotations();
+		// teneo.mapping.source
+		createTeneoAnnotations();
 		// http://www.eclipse.org/emf/2002/Ecore
 		createEcoreAnnotations();
 		// http://annotation.elver.org/internal/Target
@@ -2357,6 +2359,23 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 		   new String[] {
 			 "Target", "http://annotation.elver.org/internal/Target",
 			 "Unsupported", "http://annotation.elver.org/internal/Unsupported"
+		   });																																																																								
+	}
+
+	/**
+	 * Initializes the annotations for <b>teneo.mapping.source</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createTeneoAnnotations() {
+		String source = "teneo.mapping.source";			
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "0", "http://annotation.elver.org/",
+			 "1", "http://ejb.elver.org/"
 		   });																																																																							
 	}
 
@@ -2367,7 +2386,7 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";			
+		String source = "http://www.eclipse.org/emf/2002/Ecore";				
 		addAnnotation
 		  (pAnnotationEClass, 
 		   source, 
@@ -2491,7 +2510,7 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 	 * @generated
 	 */
 	protected void createTargetAnnotations() {
-		String source = "http://annotation.elver.org/internal/Target";				
+		String source = "http://annotation.elver.org/internal/Target";					
 		addAnnotation
 		  (attributeOverrideEClass, 
 		   source, 
@@ -2749,7 +2768,7 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 	 * @generated
 	 */
 	protected void createCollectionAnnotations() {
-		String source = "http://annotation.elver.org/internal/Collection";					
+		String source = "http://annotation.elver.org/internal/Collection";						
 		addAnnotation
 		  (attributeOverrideEClass, 
 		   source, 
@@ -2789,7 +2808,7 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 	 * @generated
 	 */
 	protected void createPersistenceMappingAnnotations() {
-		String source = "http://annotation.elver.org/internal/PersistenceMapping";							
+		String source = "http://annotation.elver.org/internal/PersistenceMapping";								
 		addAnnotation
 		  (attributeOverridesEClass, 
 		   source, 
@@ -2829,7 +2848,7 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 	 * @generated
 	 */
 	protected void createUnsupportedAnnotations() {
-		String source = "http://annotation.elver.org/internal/Unsupported";																																															
+		String source = "http://annotation.elver.org/internal/Unsupported";																																																
 		addAnnotation
 		  (mapKeyEClass, 
 		   source, 
@@ -2844,7 +2863,7 @@ public class PannotationPackageImpl extends EPackageImpl implements PannotationP
 	 * @generated
 	 */
 	protected void createPeristenceMappingAnnotations() {
-		String source = "http://annotation.elver.org/PeristenceMapping";																					
+		String source = "http://annotation.elver.org/PeristenceMapping";																						
 		addAnnotation
 		  (embeddableEClass, 
 		   source, 
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/EAnnotationImporter.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/EAnnotationImporter.java
index f9b6840a3..1dab02b72 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/EAnnotationImporter.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/EAnnotationImporter.java
@@ -12,12 +12,13 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: EAnnotationImporter.java,v 1.3 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: EAnnotationImporter.java,v 1.4 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.pannotation.util;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -34,8 +35,11 @@ import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
+import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
 import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
 import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
 
@@ -108,32 +112,43 @@ public class EAnnotationImporter {
 		void error(String msg, EAnnotation source);
 	}
 
-	/** Prefix for PAnntation encoding annotation source */
-	public static final String ANNOTATION_URI_PREFIX = "http://annotation.elver.org/";
-
-	/** Prefix for EJB PAnntation encoding annotation source */
-	public static final String ANNOTATION_URI_PREFIX_EJB = "http://ejb.elver.org/";
-
 	/** work around for EMF bug ??? Ignore details with this key */
 	public static final String IGNORE_DETAIL_KEY = "appinfo";
 
+    /** Does it have one of the sources defined in the eannotations of the epackages */
+    public boolean isPAnnotationSource(String source) {
+        return null != getPrefix(source);
+    }
+
+    /** Returns the prefix of the annotation source, search uses using the prefixes defined
+     * in the annotation teneo.mapping.source on the epackage */
+    protected String getPrefix(String source) {
+        if (source == null) {
+            return null;
+        }
+        final Collection prefixes =
+                PannotationPackage.eINSTANCE.getEAnnotation(
+                        "teneo.mapping.source").getDetails().values();
+        for (Iterator iter = prefixes.iterator(); iter.hasNext();) {
+            String prefix = (String) iter.next();
+            if (source.startsWith(prefix)) {
+                return prefix;
+            }
+        }
+        return null;
+    }
+	
 	/**
-	 * @return true if and only if the given source is the source of a PAnnotation
+	 * Add the given annotation to the given PAnnotatedEModelElement.
+	 * @throws IllegalArgumentException if the given PAnnotation
+	 * is not admitted for the given PAnnotatedEModelElement.
 	 */
-	public boolean isPAnnotationSource(String source) {
-		return source != null
-				&& (source.startsWith(ANNOTATION_URI_PREFIX) || source.startsWith(ANNOTATION_URI_PREFIX_EJB));
-	}
-
-	/** Returns the correct prefix to use */
-	protected String getPrefix(String source) {
-		if (source.indexOf(ANNOTATION_URI_PREFIX) != -1) {
-			return ANNOTATION_URI_PREFIX;
-		} else if (source.indexOf(ANNOTATION_URI_PREFIX_EJB) != -1) {
-			return ANNOTATION_URI_PREFIX_EJB;
-		} else {
-			return ANNOTATION_URI_PREFIX;
-		}
+	protected void setPAnnotation(PAnnotatedEModelElement pElement, PAnnotation pAnnotation) {
+		EReference pAnnotationRef = PamodelPackage.eINSTANCE.pAnnotationReference(pElement.eClass(), pAnnotation.eClass());
+		if (pAnnotationRef == null)
+			throw new IllegalArgumentException("PAnnotation of type '" + pAnnotation.eClass() 
+					+ "' does not apply to elements of type '" + pElement.eClass() + "'");
+		pElement.eSet(pAnnotationRef, pAnnotation);
 	}
 
 	/**
@@ -209,7 +224,7 @@ public class EAnnotationImporter {
 	 * @return Returns the "collection" pannotation eclass that has elements of the given eclass. Returns null if no
 	 *         such pannotation exists exists.
 	 */
-	private EClass getPAnnotationCollectionEClass(EClass annotationEClass) {
+	protected EClass getPAnnotationCollectionEClass(EClass annotationEClass) {
 		if (null == annotationEClass || !PannotationPackage.eINSTANCE.getPAnnotation().isSuperTypeOf(annotationEClass))
 			return null;
 		EAnnotation annotation = annotationEClass.getEAnnotation("http://annotation.elver.org/internal/Collection");
@@ -218,6 +233,7 @@ public class EAnnotationImporter {
 		}
 		String name = (String) annotation.getDetails().get("name");
 		String pkgNS = (String) annotation.getDetails().get("packageNS");
+	
 		pkgNS = (null == pkgNS) ? PannotationPackage.eNS_URI : pkgNS;
 		EPackage ePkg = EPackage.Registry.INSTANCE.getEPackage(pkgNS);
 		return (null == ePkg) ? null : (EClass) ePkg.eResource().getEObject("//" + name);
@@ -229,7 +245,7 @@ public class EAnnotationImporter {
 	 * @throws IllegalArgumentException
 	 *             if the given EClass is not a "collection" EClass.
 	 */
-	private PAnnotation createPAnnotationCollection(EClass collAnnotationEClass, List memberPAnnotations) {
+	protected PAnnotation createPAnnotationCollection(EClass collAnnotationEClass, List memberPAnnotations) {
 		if (!PannotationPackage.eINSTANCE.getPAnnotation().isSuperTypeOf(collAnnotationEClass))
 			throw new IllegalArgumentException(collAnnotationEClass.getName() + " is not a \"collection\" PAnnotation.");
 		EStructuralFeature valueFeature = collAnnotationEClass.getEStructuralFeature("value");
@@ -293,12 +309,13 @@ public class EAnnotationImporter {
 	 */
 	protected PAnnotation createPAnnotation(EAnnotation eAnnotation) throws EAnnotationImportException {
 		// Indirection so that the annotation processing mechanism can be extended.
-		EClass pAnnotationEClass = getElverAnnotationEClass(eAnnotation);
+		EClass pAnnotationEClass = getPAnnotationEClass(eAnnotation);
 		if (pAnnotationEClass == null) {
 			error("Unknown annotation type", eAnnotation);
 			throw new EAnnotationImportException("Unknown annotation type");
 		}
-		PAnnotation pAnnotation = (PAnnotation) EcoreUtil.create(pAnnotationEClass);
+		Object o = EcoreUtil.create(pAnnotationEClass);
+		PAnnotation pAnnotation = (PAnnotation) o;
 		pAnnotation.setEModelElement(eAnnotation.getEModelElement());
 		return pAnnotation;
 	}
@@ -358,33 +375,6 @@ public class EAnnotationImporter {
 		}
 	}
 
-	// Methods allows for easy overridding to add persistence-specific annotations
-	// These methods all provide indirection to existing methods so that extensions can
-	// plug in and/or override as necessary
-	protected boolean isElverAnnotationSource(String source) {
-		return isPAnnotationSource(source);
-	}
-
-	protected boolean isElverSubordinate(EAnnotation eAnnotation) {
-		return isPAnnotationSubordinate(eAnnotation);
-	}
-
-	protected String getElverSubordinateId(EAnnotation eAnnotation) {
-		return getPAnnotationSubordinateId(eAnnotation);
-	}
-
-	protected EClass getElverAnnotationEClass(EAnnotation eAnnotation) {
-		return getPAnnotationEClass(eAnnotation);
-	}
-
-	protected EClass getElverCollectionEClass(EClass eClass) {
-		return getPAnnotationCollectionEClass(eClass);
-	}
-
-	protected PAnnotation createElverCollection(EClass collAnnotationEClass, List memberPAnnotations) {
-		return createPAnnotationCollection(collAnnotationEClass, memberPAnnotations);
-	}
-
 	/**
 	 * Sets the list of visible annotations used used the import process.
 	 */
@@ -400,15 +390,15 @@ public class EAnnotationImporter {
 			EAnnotation eAnnotation = (EAnnotation) i.next();
 			// Make use of indirection to allow behaviors to be customized
 			// for annotation processing extensions
-			if (isElverAnnotationSource(eAnnotation.getSource())) { // ignore otherwise
-				if (isElverSubordinate(eAnnotation)) {
-					subAnnotationsById.put(getElverSubordinateId(eAnnotation), eAnnotation);
+			if (isPAnnotationSource(eAnnotation.getSource())) { // ignore otherwise
+				if (isPAnnotationSubordinate(eAnnotation)) {
+					subAnnotationsById.put(getPAnnotationSubordinateId(eAnnotation), eAnnotation);
 				} else {
 					// the collection pannotation is retrieved, each annotation which can be specified individually or
 					// as part
 					// of a collection is identified here
 
-					EClass containerPAnnotationEClass = getElverCollectionEClass(getElverAnnotationEClass(eAnnotation));
+					EClass containerPAnnotationEClass = getPAnnotationCollectionEClass(getPAnnotationEClass(eAnnotation));
 					if (containerPAnnotationEClass != null
 							&& PannotationPackage.eINSTANCE.isTarget(containerPAnnotationEClass, eAnnotation
 									.getEModelElement().eClass())) {
@@ -430,7 +420,7 @@ public class EAnnotationImporter {
 		Set usedAnnotations = new HashSet(collectibleAnnotationsByType.keySet());
 		for (ListIterator i = mainAnnotations.listIterator(); i.hasNext();) {
 			EAnnotation eAnnotation = (EAnnotation) i.next();
-			if (!usedAnnotations.add(getElverAnnotationEClass(eAnnotation))) {
+			if (!usedAnnotations.add(getPAnnotationEClass(eAnnotation))) {
 				error("Duplicate annotation", eAnnotation);
 				// drop duplicate
 				i.remove();
@@ -461,7 +451,7 @@ public class EAnnotationImporter {
 	 *             if the conversion fails.
 	 */
 	protected void initPAnnotation(PAnnotation pAnnotation, EAnnotation eAnnotation) throws EAnnotationImportException {
-		if (pAnnotation.eClass() != getElverAnnotationEClass(eAnnotation)) {
+		if (pAnnotation.eClass() != getPAnnotationEClass(eAnnotation)) {
 			error("Trying to initialize " + pAnnotation + " from " + eAnnotation.getSource(), eAnnotation);
 			throw new EAnnotationImportException("Trying to initialize " + pAnnotation + " from "
 					+ eAnnotation.getSource() + " in " + eAnnotation.getSource());
@@ -535,7 +525,7 @@ public class EAnnotationImporter {
 					EModelElement targetElement = ((EAnnotation) componentEAnnotations.get(0)).getEModelElement();
 					for (Iterator j = componentEAnnotations.iterator(); j.hasNext();)
 						componentPAnnotations.add(process((EAnnotation) j.next()));
-					PAnnotation collAnnotation = createElverCollection(collAnnotationEClass, componentPAnnotations);
+					PAnnotation collAnnotation = createPAnnotationCollection(collAnnotationEClass, componentPAnnotations);
 					collAnnotation.setEModelElement(targetElement);
 					report(collAnnotation);
 				} catch (EAnnotationImportException e) {
@@ -573,7 +563,7 @@ public class EAnnotationImporter {
 		for (Iterator it = typeAnnotations.iterator(); it.hasNext();) {
 			final EAnnotation annotation = (EAnnotation) it.next();
 			if (eAttribute.getEAnnotation(annotation.getSource()) == null) {
-				EClass pAnnotationEClass = getElverAnnotationEClass(annotation);
+				EClass pAnnotationEClass = getPAnnotationEClass(annotation);
 				if (pAnnotationEClass != null
 						&& PannotationPackage.eINSTANCE.isTarget(pAnnotationEClass, eAttribute.eClass())) {
 					if (copier == null) {
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java
index a79707ce3..f11d041f1 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PannotationAdapterFactory.java,v 1.5 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PannotationAdapterFactory.java,v 1.6 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation.util;
 
@@ -10,6 +10,8 @@ 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.annotations.pannotation.*;
+
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java
index c2206c7c5..179b445d6 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PannotationSwitch.java,v 1.5 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PannotationSwitch.java,v 1.6 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation.util;
 
@@ -10,6 +10,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.teneo.annotations.pannotation.*;
+
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java
index 6af20a03e..51634a2dc 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PannotationValidator.java,v 1.5 2006/08/24 22:12:35 mtaal Exp $
+ * $Id: PannotationValidator.java,v 1.6 2006/08/31 22:46:54 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pannotation.util;
 
@@ -25,6 +25,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.teneo.annotations.pannotation.*;
+
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
 import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverrides;
 import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java
index afe3b1b38..7028fc48b 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AnnotationParser.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: AnnotationParser.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
@@ -71,6 +71,9 @@ public class AnnotationParser {
 		final ComplexNode cn = new ComplexNode();
 		cn.setName(annotationTokenizer.getLexeme());
 		addToParent(pn, cn);
+		if (pn == null) {
+			parserNodes.add(cn);
+		}
 		
 		// now parse the next token
 		final int token = annotationTokenizer.nextToken();
@@ -113,16 +116,22 @@ public class AnnotationParser {
 								annotationTokenizer.getErrorText());
 					}
 					final int nextToken = annotationTokenizer.nextToken();
-					if (nextToken == annotationTokenizer.T_VALUE) { 
+					if (nextToken == AnnotationTokenizer.T_VALUE) { 
 						final String value = annotationTokenizer.getLexeme();
 						final PrimitiveValueNode vn = new PrimitiveValueNode();
 						vn.setName(identifier);
 						vn.setValue(value);
 						addToParent(pn, vn);
-					} else if (nextToken == annotationTokenizer.T_TYPENAME) {
+					} else if (nextToken == AnnotationTokenizer.T_TYPENAME) {
 						final ReferenceValueNode rvn = new ReferenceValueNode();
 						rvn.setName(identifier);
 						parseTypeName(rvn);
+						addToParent(pn, rvn);
+					} else if (nextToken == AnnotationTokenizer.T_ARRAYSTART) {
+						final ArrayValueNode avn = new ArrayValueNode();
+						avn.setName(identifier);
+						parseArray(avn);
+						addToParent(pn, avn);
 					} else if (annotationTokenizer.nextToken() != AnnotationTokenizer.T_VALUE) {
 						throw new AnnotationParserException("No value token after =, see _ for error position " +
 								annotationTokenizer.getErrorText());
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java
index f9b5cfb38..dc3d0b7ce 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationTokenizer.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AnnotationTokenizer.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: AnnotationTokenizer.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
@@ -61,37 +61,18 @@ class AnnotationTokenizer {
 	static final int T_CONTENTEND = 8;
 
 	static final int T_COMMA = 9;
-	
-	/**
-	 * Single char array used when JTokenizer has no Source.
-	 */
-
-	private char[] nullData = new char[] { 0 };
-
-	/* -------------------------- Non-Static Section -------------------------- */
-
-	/**
-	 * Data.
-	 */
 
+	/** Data */
 	private char[] data;
 
-	/**
-	 * Length.
-	 */
-
+	/** Length */
 	private int length;
 
-	/**
-	 * Points to the start of the current token.
-	 */
+	/** Points to the start of the current token */
 
 	private int tokBeg;
 
-	/**
-	 * Ponts to the end of the current token.
-	 */
-
+	/** Ponts to the end of the current token. */
 	private int tokEnd;
 
 	/** For which model element are we doing this */
@@ -176,7 +157,7 @@ class AnnotationTokenizer {
 	
 				// TYPENAME
 				case '@': {
-					// after the dollar the identifier part needs to be found
+					++lCur; // get rid of the @
 					tokBeg = lCur; // Save starting point of current lexeme.
 	
 					do {
@@ -266,7 +247,7 @@ class AnnotationTokenizer {
 	 */
 	final String getErrorText() {
 		final StringBuffer result = new StringBuffer();
-		//result.append("E Element: " + eNamedElement.getName() + "\n");
+		result.append("E Element: " + eNamedElement.getName() + "\n");
 		result.append("Begin: " + tokBeg + "\n");
 		result.append("End: " + tokEnd + "\n");
 		result.append("Length: " + data.length + "\n");
@@ -309,7 +290,6 @@ class AnnotationTokenizer {
 		tokBeg = oldTokBeg;
 		tokEnd = oldTokEnd;
 		currentToken = oldCurrentToken;
-		System.err.println(result.toString());
 		return result.toString();
 	}
 }
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ArrayValueNode.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ArrayValueNode.java
index 25be24d82..bb1129a9e 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ArrayValueNode.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ArrayValueNode.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ArrayValueNode.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: ArrayValueNode.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
@@ -20,6 +20,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EPackage;
 
 
@@ -29,6 +31,8 @@ import org.eclipse.emf.ecore.EPackage;
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
 class ArrayValueNode extends ParserNode{
+	/** Log it */
+	private final static Log log = LogFactory.getLog(ArrayValueNode.class);
 
 	/** The value */
 	private List children = new ArrayList();
@@ -39,15 +43,25 @@ class ArrayValueNode extends ParserNode{
 	}
 	
 	/** Translate into a list of eobjects */
-	List convert(EPackage ePackage) {
+	List convert(EClassResolver ecr) {
+		log.debug("Converting array value node");
+
 		final ArrayList result = new ArrayList();
 		for (Iterator it = children.iterator(); it.hasNext();) {
 			final ParserNode pn = (ParserNode)it.next();
-			if (!(pn instanceof ComplexNode)) {
-				throw new AnnotationParserException("An array annotation value may only contain typenames and not primitive values");
+			if (pn instanceof ComplexNode) {
+				final ComplexNode cn = (ComplexNode)pn;
+				result.add(cn.convert(ecr));
+			} else if (pn instanceof ReferenceValueNode) {
+				final ReferenceValueNode rvn = (ReferenceValueNode)pn;
+				result.add(rvn.convert(ecr));
+			} else if (pn instanceof ArrayValueNode) {
+				final ArrayValueNode avn = (ArrayValueNode)pn;
+				result.addAll(avn.convert(ecr));
+			} else {
+				throw new AnnotationParserException("Type " + pn.getClass().getName() + "/" + pn.getName() +
+						" not supported here");
 			}
-			final ComplexNode cn = (ComplexNode)pn;
-			result.add(cn.convert(ePackage));
 		}
 		return result;
 	}	
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ComplexNode.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ComplexNode.java
index 5813c650c..0172e50bb 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ComplexNode.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ComplexNode.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ComplexNode.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: ComplexNode.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
@@ -20,6 +20,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
@@ -37,6 +39,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
 class ComplexNode extends ParserNode {
+	
+	/** Log it */
+	private final static Log log = LogFactory.getLog(ComplexNode.class);
 
 	/** The value */
 	private List children = new ArrayList();
@@ -47,8 +52,13 @@ class ComplexNode extends ParserNode {
 	}
 	
 	/** Translate into an eclass */
-	EObject convert(EPackage ePackage) {
-		final EClass eClass = (EClass)ePackage.getEClassifier(getName());
+	EObject convert(EClassResolver ecr) {
+		log.debug("Converting " + getName() + " to EObject ");
+		
+		final EClass eClass = ecr.getEClass(getName()); 
+		if (eClass == null) {
+			throw new AnnotationParserException("No eclass found with name " + getName());
+		}
 		final EObject eobj = EcoreUtil.create(eClass);
 
 		for (Iterator it = children.iterator(); it.hasNext();) {
@@ -57,6 +67,7 @@ class ComplexNode extends ParserNode {
 			final EStructuralFeature efeature = ParserUtil.getEStructuralFeature(eClass, pn.getName());
 			if (child instanceof PrimitiveValueNode) {
 				final PrimitiveValueNode pvn = (PrimitiveValueNode)child;
+				log.debug("Primitive child: " + pvn.getName() + ": " + pvn.getValue());
 				if (!(efeature instanceof EAttribute)) {
 					throw new AnnotationParserException("The EFeature " + efeature.getName() + "/" +
 							eClass.getName() + " is not an eattribute but a " + efeature.getClass().getName());
@@ -65,10 +76,12 @@ class ComplexNode extends ParserNode {
 				if (!efeature.isMany()) {
 					eobj.eSet(efeature, ParserUtil.convertValue((EDataType)eType, pvn.getValue()));
 				} else {
-					String[] sources = pvn.getValue().split("\\s+");
-					List referenced = new ArrayList(sources.length);
-					for (int i = 0; i < sources.length; i++)
+					final String[] sources = pvn.getValue().split("\\s+");
+					log.debug("Child is many, splitting content into " + sources.length + " parts");
+					final List referenced = new ArrayList(sources.length);
+					for (int i = 0; i < sources.length; i++) {
 						referenced.add(ParserUtil.convertValue((EDataType)eType, sources[i]));
+					}
 					((List) eobj.eGet(efeature)).addAll(referenced);
 				}
 			} else if (child instanceof ArrayValueNode) {
@@ -81,7 +94,8 @@ class ComplexNode extends ParserNode {
 					throw new AnnotationParserException("The EFeature " + efeature.getName() + "/" +
 							eClass.getName() + " is not ismany");
 				}
-				eobj.eSet(eref, ((ArrayValueNode)child).convert(ePackage));
+				log.debug("Array child");
+				eobj.eSet(eref, ((ArrayValueNode)child).convert(ecr));
 			} else if (child instanceof ReferenceValueNode) {
 				if (!(efeature instanceof EReference)) {
 					throw new AnnotationParserException("The EFeature " + efeature.getName() + "/" +
@@ -92,7 +106,8 @@ class ComplexNode extends ParserNode {
 					throw new AnnotationParserException("The EFeature " + efeature.getName() + "/" +
 							eClass.getName() + " is ismany, while a not ismany is expected");
 				}
-				eobj.eSet(eref, ((ReferenceValueNode)child).convert(ePackage));
+				log.debug("Reference child " + pn.getName());
+				eobj.eSet(eref, ((ReferenceValueNode)child).convert(ecr));
 			}
 		}
 		return eobj;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EAnnotationParserImporter.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EAnnotationParserImporter.java
index 4c7316b83..a4bd15ea8 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EAnnotationParserImporter.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EAnnotationParserImporter.java
@@ -11,21 +11,32 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: EAnnotationParserImporter.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: EAnnotationParserImporter.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
+import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
+import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
+import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
 
 /**
  * Walks over the pamodel and the paepackages and translates eannotations to 
@@ -33,7 +44,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-class EAnnotationParserImporter {
+public class EAnnotationParserImporter implements EClassResolver {
 	/** Log it */
 	private final static Log log = LogFactory.getLog(EAnnotationParserImporter.class);
 
@@ -43,32 +54,118 @@ class EAnnotationParserImporter {
 	/** Parse an pamodel */
 	public void process(PAnnotatedModel paModel) {
 		for (Iterator it = paModel.getPaEPackages().iterator(); it.hasNext();) {
-			final PAnnotatedEPackage pae = (PAnnotatedEPackage)it.next();
+			final PAnnotatedEPackage pap = (PAnnotatedEPackage)it.next();
+			log.debug("Processing package " + pap.getAnnotatedEPackage().getName());
+			processAnnotatedModelElement(pap, pap.eClass().getEPackage());
+
+			// and now the eclasses 
+			process(pap);
+		}
+	}
+	
+	/** Process package */
+	protected void process(PAnnotatedEPackage pap) {
+		for (Iterator it = pap.getPaEClasses().iterator(); it.hasNext();) {
+			final PAnnotatedEClass pac = (PAnnotatedEClass)it.next();
+			processAnnotatedModelElement(pac, pac.getAnnotatedEClass().getEPackage());
+			process(pac);
+		}
+	}
+	
+	/** Process the efeatures */
+	protected void process(PAnnotatedEClass pac) {
+		log.debug("Processing eclass " + pac.getAnnotatedEClass().getName());
+		for (Iterator it = pac.getPaEStructuralFeatures().iterator(); it.hasNext();) {
+			final PAnnotatedEStructuralFeature paf = (PAnnotatedEStructuralFeature)it.next();
+			processAnnotatedModelElement(paf, paf.getAnnotatedEStructuralFeature().eClass().getEPackage());
 		}
 	}
 	
 	/** Process a type with its eannotations */
-	public void process(ENamedElement ene) {
+	protected void processAnnotatedModelElement(PAnnotatedEModelElement pee, EPackage epack) {
+		log.debug("Processing " + pee.getAnnotatedElement().getName());
 		final ArrayList parsedNodes = new ArrayList();
-		for (Iterator it = ene.getEAnnotations().iterator(); it.hasNext();) {
-			final EAnnotation ea = (EAnnotation)it.next();
-			for (Iterator i = ea.getDetails().entrySet().iterator(); i.hasNext();) {
-				Map.Entry pAnnotationDetails = (Map.Entry) i.next();
-				String fName = (String) pAnnotationDetails.getKey();
-				if (fName.compareTo("appinfo") == 0 || fName.compareTo("value") == 0) {
-					parsedNodes.addAll(
-							annotationParser.parse(ene, (String)pAnnotationDetails.getValue()));
-				}
+		for (Iterator it = pee.getAnnotatedElement().getEAnnotations().iterator(); it.hasNext();) {
+			parsedNodes.addAll(process((EAnnotation)it.next(), pee.getAnnotatedElement()));
+		}
+		
+		// now also do the annotations on the edatatype (if any)
+		if (pee.getAnnotatedElement() instanceof EAttribute) {
+			final EAttribute eattr = (EAttribute)pee.getAnnotatedElement();
+			final EDataType edt = (EDataType)eattr.getEType();
+			for (Iterator it = edt.getEAnnotations().iterator(); it.hasNext();) {
+				parsedNodes.addAll(process((EAnnotation)it.next(), pee.getAnnotatedElement()));
 			}
 		}
 		
 		// now the parsed nodes should be translated into features of the enamedelement
 		// this is done multiplelevel
+		log.debug("Number of parsed typename annotations " + parsedNodes.size());
+		final ArrayList eobjects = new ArrayList();
+		for (Iterator it = parsedNodes.iterator(); it.hasNext();) {
+			final ComplexNode cn = (ComplexNode)it.next();
+			eobjects.add(cn.convert(this));
+		}
+		
+		// now for each eobject find which eref stores it!
+		log.debug("Find efeature for each created eobject");
+		for (Iterator it = eobjects.iterator(); it.hasNext();) {
+			EObject eobj = (EObject)it.next();
+			log.debug("EClass " + eobj.eClass().getName());
+			
+			boolean found = false;
+			for (Iterator eit = pee.eClass().getEAllReferences().iterator(); eit.hasNext();) {
+				final EReference eref = (EReference)eit.next();
+				if (eref.getEReferenceType() == eobj.eClass()) {
+					log.debug("Found EReference " + eref.getName() + " for " + eobj.eClass().getName());
+					if (eref.isMany()) {
+						((List)pee.eGet(eref)).add(eobj);
+					} else {
+						pee.eSet(eref, eobj);
+					}
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				throw new AnnotationParserException("The eclass: " + pee.eClass().getName() + 
+						" does not have an efeature for " + eobj.eClass().getName());
+			}
+		}
+	}
+
+	/** Processes EAnnotations */
+	private ArrayList process(EAnnotation ea, ENamedElement ene) {
+		final ArrayList result = new ArrayList();
+
+		if (!isValidSource(ea.getSource())) {
+			return result;
+		}
+		
+		log.debug("Processing annotations ");
+		for (Iterator i = ea.getDetails().entrySet().iterator(); i.hasNext();) {
+			final Map.Entry pAnnotationDetails = (Map.Entry) i.next();
+			String fName = (String) pAnnotationDetails.getKey();
+			// todo externalize
+			if (fName.compareTo("appinfo") == 0 || fName.compareTo("value") == 0) {
+				log.debug("Annotation content: \n " + (String)pAnnotationDetails.getValue());
+				result.addAll(annotationParser.parse(ene, (String)pAnnotationDetails.getValue()));
+			}
+		}
+		return result;
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.eclipse.emf.teneo.annotations.parser.EClassResolver#getEClass(java.lang.String)
+	 */
+	public EClass getEClass(String name) {
+		return (EClass)PannotationPackage.eINSTANCE.getEClassifier(name);
+	}
+
 	/** Is a valid source */
 	protected boolean isValidSource(String source) {
+		if (source == null) return false;
 		return source.startsWith("teneo.jpa") ||
 			source.startsWith("teneo.mapping");
 	}
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EClassResolver.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EClassResolver.java
new file mode 100644
index 000000000..9ab307394
--- /dev/null
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/EClassResolver.java
@@ -0,0 +1,31 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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: EClassResolver.java,v 1.1 2006/08/31 22:46:54 mtaal Exp $
+ */
+
+package org.eclipse.emf.teneo.annotations.parser;
+
+import org.eclipse.emf.ecore.EClass;
+
+
+/**
+ * Finds an eclass using a certain string
+ * 
+ * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
+ */
+public interface EClassResolver {
+	
+	/** Return an eclass, returns null if not found */
+	EClass getEClass(String name);
+}
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserNode.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserNode.java
index 0d6f9c270..b6ca12800 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserNode.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserNode.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ParserNode.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: ParserNode.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
@@ -25,7 +25,7 @@ package org.eclipse.emf.teneo.annotations.parser;
 abstract class ParserNode {
 	
 	/** The name parsed */
-	private String name;
+	private String name = "value";
 
 	/**
 	 * @return the name
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserUtil.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserUtil.java
index d81b2431d..f22ac6623 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserUtil.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ParserUtil.java
@@ -11,21 +11,27 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ParserUtil.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: ParserUtil.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
 
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
+import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
 
 /**
  * Util class
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 
 public class ParserUtil {
@@ -50,6 +56,4 @@ public class ParserUtil {
 			throw new AnnotationParserException("Cannot convert '" + name + "' to an efeature for eclass " + eClass.getName());
 		}
 	}
-	
-	
 }
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/PrimitiveValueNode.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/PrimitiveValueNode.java
index 4033be86b..c4f284e4c 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/PrimitiveValueNode.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/PrimitiveValueNode.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: PrimitiveValueNode.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: PrimitiveValueNode.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
@@ -38,6 +38,12 @@ class PrimitiveValueNode extends ParserNode {
 	 * @param value the value to set
 	 */
 	public void setValue(String value) {
-		this.value = value;
+		// correct a small mistake in the tokenizer
+		if (value != null && value.length() > 1 && value.charAt(0) == '"' && 
+				value.charAt(value.length() - 1) == '"') {
+			this.value = value.substring(1, value.length() - 1);
+		} else {
+			this.value = value;
+		}
 	}
 }
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ReferenceValueNode.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ReferenceValueNode.java
index 961ea9775..605944f1e 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ReferenceValueNode.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/ReferenceValueNode.java
@@ -11,11 +11,13 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: ReferenceValueNode.java,v 1.1 2006/08/31 15:33:17 mtaal Exp $
+ * $Id: ReferenceValueNode.java,v 1.2 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.parser;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
@@ -26,6 +28,8 @@ import org.eclipse.emf.ecore.EPackage;
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
 class ReferenceValueNode extends ParserNode {
+	/** Log it */
+	private final static Log log = LogFactory.getLog(ArrayValueNode.class);
 
 	/** The value */
 	private ParserNode value;
@@ -45,11 +49,13 @@ class ReferenceValueNode extends ParserNode {
 	}
 	
 	/** Translate into a list of eobjects */
-	EObject convert(EPackage ePackage) {
+	EObject convert(EClassResolver ecr) {
+		log.debug("Converting reference node " + getName());
 		if (!(value instanceof ComplexNode)) {
-			throw new AnnotationParserException("An reference annotation value may only contain a typename");
+			throw new AnnotationParserException("A reference annotation value may only " +
+					"contain a typename");
 		}
 		final ComplexNode cn = (ComplexNode)value;
-		return cn.convert(ePackage);
+		return cn.convert(ecr);
 	}
 }
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilder.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilder.java
index 3c46eda3e..d33888a8e 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilder.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilder.java
@@ -11,29 +11,123 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: PersistenceMappingBuilder.java,v 1.2 2006/07/23 19:38:45 mtaal Exp $
+ * $Id: PersistenceMappingBuilder.java,v 1.3 2006/08/31 22:46:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.mapper;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.emf.teneo.PersistenceOptions;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
+import org.eclipse.emf.teneo.annotations.pamodel.util.BasicPamodelBuilder;
+import org.eclipse.emf.teneo.annotations.pamodel.util.EannotationPamodelBuilder;
+import org.eclipse.emf.teneo.annotations.parser.EAnnotationParserImporter;
 
 /**
- * Receives a list of ecore files and generates a mapping model.The mapping model
+ * Receives a list of ecore files and generates a mapping model using different strategies. The mapping model is
+ * returned.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
-public interface PersistenceMappingBuilder {
+public class PersistenceMappingBuilder {
 
-	/** The instance of this builder */
-	PersistenceMappingBuilder INSTANCE = new PersistenceMappingBuilderImpl();
+	/** The logger */
+	protected static final Log log = LogFactory.getLog(PersistenceMappingBuilder.class);
 
+	/** The instance to use */
+	public static final PersistenceMappingBuilder INSTANCE = new PersistenceMappingBuilder();
+	
 	/** Receives a list of ecore files and returns a Mapping */
-	public PAnnotatedModel buildMapping(String[] ecoreFiles, PersistenceOptions options);
+	public PAnnotatedModel buildMapping(String[] ecoreFiles, PersistenceOptions po) {
+		// note options are set in call to buildPersistenceMapping(epackages)
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new EcoreResourceFactoryImpl());
+		ArrayList epackages = new ArrayList();
+		for (int i = 0; i < ecoreFiles.length; i++) {
+
+			log.debug("Reading ecore file: " + ecoreFiles[i]);
+
+			Resource res = resourceSet.getResource(URI.createFileURI(ecoreFiles[i]), true);
+
+			Iterator it = res.getAllContents();
+			while (it.hasNext()) {
+				final Object obj = it.next();
+				if (obj instanceof EPackage) {
+					EPackage epack = (EPackage) obj;
+					EPackage epackImpl = EPackage.Registry.INSTANCE.getEPackage(epack.getNsURI());
+					if (epackImpl != null) {
+						epackages.add(epackImpl);
+					}
+				}
+			}
+		}
+
+		return buildMapping((EPackage[]) epackages.toArray(new EPackage[epackages.size()]), po);
+	}
+
+	/** Builds a persistence mapping for one or more epackages */
+	public PAnnotatedModel buildMapping(EPackage[] epackages, PersistenceOptions po) {
+		// create the pamodel
+
+		// DCB: Introduce indirection so that extensions to annotation processing mechanism
+		// can provide their own model builder.
+		BasicPamodelBuilder pamodelBuilder = getModelBuilder();
+		log.debug("Creating pamodel for the following epackages");
+		for (int i = 0; i < epackages.length; i++) {
+			log.debug(epackages[i].getName());
+			pamodelBuilder.addRecurse(epackages[i]);
+		}
+
+		log.debug("Create base pannotated model");
+		PAnnotatedModel pam = pamodelBuilder.getPAnnotatedModel();
+
+		log.debug("Import eannotations");
+		// DCB: Introduce indirection so that extensions to annotation processing mechanism
+		// can provide their own model builder.
+		EannotationPamodelBuilder epb = getAnnotationModelBuilder();
+		epb.setPAnnotatedModel(pam);
+		epb.processCurrentPAnnotatedModel();
+
+		log.debug("Parse annotations");
+		getEAnnotationParserImporter().process(pam);
+		
+		log.debug("Add default annotations");
+		// DCB: Introduce indirection so that extensions to annotation processing mechanism
+		// can provide their own default annotation.
+		getDefaultAnnotator().map(pam, po);
+
+		log.debug("Returning created pamodel");
+		return pam;
+	}
+
+	// DCB: New methods to allow for extension
+	protected DefaultAnnotator getDefaultAnnotator() {
+		return new DefaultAnnotator();
+	}
+
+	protected BasicPamodelBuilder getModelBuilder() {
+		return new BasicPamodelBuilder();
+	}
 
-	/** Receives a list of epackages and returns a Mapping */
-	public PAnnotatedModel buildMapping(EPackage[] epackages, PersistenceOptions options);
+	/** Return the EAnnotationImporter */
+	protected EannotationPamodelBuilder getAnnotationModelBuilder() {
+		return new EannotationPamodelBuilder();
+	}
+	
+	/** Return a java annotation parser */
+	protected EAnnotationParserImporter getEAnnotationParserImporter() {
+		return new EAnnotationParserImporter();
+	}
 }
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilderImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilderImpl.java
deleted file mode 100644
index 31ec31c46..000000000
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/mapper/PersistenceMappingBuilderImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2005, 2006 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: PersistenceMappingBuilderImpl.java,v 1.2 2006/07/23 19:38:45 mtaal Exp $
- */
-
-package org.eclipse.emf.teneo.mapper;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-import org.eclipse.emf.teneo.PersistenceOptions;
-import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedModel;
-import org.eclipse.emf.teneo.annotations.pamodel.util.BasicPamodelBuilder;
-import org.eclipse.emf.teneo.annotations.pamodel.util.EannotationPamodelBuilder;
-
-/**
- * Receives a list of ecore files and generates a mapping model using different strategies. The mapping model is
- * returned.
- * 
- * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.2 $
- */
-public class PersistenceMappingBuilderImpl implements PersistenceMappingBuilder {
-
-	/** The logger */
-	protected static final Log log = LogFactory.getLog(PersistenceMappingBuilderImpl.class);
-
-	/** Receives a list of ecore files and returns a Mapping */
-	public PAnnotatedModel buildMapping(String[] ecoreFiles, PersistenceOptions po) {
-		// note options are set in call to buildPersistenceMapping(epackages)
-
-		ResourceSet resourceSet = new ResourceSetImpl();
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new EcoreResourceFactoryImpl());
-		ArrayList epackages = new ArrayList();
-		for (int i = 0; i < ecoreFiles.length; i++) {
-
-			log.debug("Reading ecore file: " + ecoreFiles[i]);
-
-			Resource res = resourceSet.getResource(URI.createFileURI(ecoreFiles[i]), true);
-
-			Iterator it = res.getAllContents();
-			while (it.hasNext()) {
-				final Object obj = it.next();
-				if (obj instanceof EPackage) {
-					EPackage epack = (EPackage) obj;
-					EPackage epackImpl = EPackage.Registry.INSTANCE.getEPackage(epack.getNsURI());
-					if (epackImpl != null) {
-						epackages.add(epackImpl);
-					}
-				}
-			}
-		}
-
-		return buildMapping((EPackage[]) epackages.toArray(new EPackage[epackages.size()]), po);
-	}
-
-	/** Builds a persistence mapping for one or more epackages */
-	public PAnnotatedModel buildMapping(EPackage[] epackages, PersistenceOptions po) {
-		// create the pamodel
-
-		// DCB: Introduce indirection so that extensions to annotation processing mechanism
-		// can provide their own model builder.
-		BasicPamodelBuilder pamodelBuilder = getModelBuilder();
-		log.debug("Creating pamodel for the following epackages");
-		for (int i = 0; i < epackages.length; i++) {
-			log.debug(epackages[i].getName());
-			pamodelBuilder.addRecurse(epackages[i]);
-		}
-
-		log.debug("Create base pannotated model");
-		PAnnotatedModel pam = pamodelBuilder.getPAnnotatedModel();
-
-		log.debug("Import eannotations");
-		// DCB: Introduce indirection so that extensions to annotation processing mechanism
-		// can provide their own model builder.
-		EannotationPamodelBuilder epb = getAnnotationModelBuilder();
-		epb.setPAnnotatedModel(pam);
-		epb.processCurrentPAnnotatedModel();
-
-		log.debug("Add default annotations");
-		// DCB: Introduce indirection so that extensions to annotation processing mechanism
-		// can provide their own default annotation.
-		getDefaultAnnotator().map(pam, po);
-
-		log.debug("Returning created pamodel");
-		return pam;
-	}
-
-	// DCB: New methods to allow for extension
-	protected DefaultAnnotator getDefaultAnnotator() {
-		return new DefaultAnnotator();
-	}
-
-	protected BasicPamodelBuilder getModelBuilder() {
-		return new BasicPamodelBuilder();
-	}
-
-	protected EannotationPamodelBuilder getAnnotationModelBuilder() {
-		return new EannotationPamodelBuilder();
-	}
-}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.ecore b/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.ecore
index 512be9b0f..0ffabd4b4 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.ecore
+++ b/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.ecore
@@ -4,7 +4,6 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="hbannotation"
     nsURI="http://www.eclipse.org/emf/teneo/2006/HbAnnotation" nsPrefix="org.eclipse.emf.teneo.hibernate">
   <eAnnotations source="teneo.mapping.source">
-    <details key="0" value="teneo.hibernate:"/>
     <details key="1" value="http://hibernate.elver.org/"/>
   </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="HbAnnotation" interface="true" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pannotation.ecore#//PAnnotation">
@@ -43,7 +42,16 @@
         upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.teneo.annotations/model/pannotation.ecore#//Column"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Parameter">
+  <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//HbAnnotation">
+    <eAnnotations source="http://annotation.elver.org/internal/Collection">
+      <details key="name" value="Parameters"/>
+      <details key="packageNS" value="http://www.eclipse.org/emf/teneo/2006/HbAnnotation"/>
+    </eAnnotations>
+    <eAnnotations source="http://annotation.elver.org/internal/Target">
+      <details key="0" value="EStructuralFeature"/>
+      <details key="1" value="EClass"/>
+      <details key="2" value="EPackage"/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
@@ -70,4 +78,20 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="long"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GenericGenerator" eSuperTypes="#//HbAnnotation">
+    <eAnnotations source="http://annotation.elver.org/internal/Target">
+      <details key="0" value="EStructuralFeature"/>
+      <details key="1" value="EClass"/>
+      <details key="2" value="EPackage"/>
+    </eAnnotations>
+    <eAnnotations source="http://annotation.elver.org/internal/Collection">
+      <details key="name" value="GenericGenerators"/>
+      <details key="packageNS" value="http://www.eclipse.org/emf/teneo/2006/HbAnnotation"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+        eType="#//Parameter"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.genmodel b/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.genmodel
index d3b39ed97..13f71298c 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.genmodel
+++ b/plugins/org.eclipse.emf.teneo.hibernate/model/hbannotation.genmodel
@@ -1,10 +1,10 @@
 <?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.hibernate/src"
-    editDirectory="/org.eclipse.emf.teneo.hibernate.edit/src" editorDirectory="/org.eclipse.emf.teneo.hibernate.editor/src"
-    modelPluginID="org.eclipse.emf.teneo.hibernate" templateDirectory="" redirection=""
-    modelName="HbAnnotation" editPluginClass="org.eclipse.emf.teneo.hibernate.hbannotation.provider.HbAnnotationEditPlugin"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n"
+    modelDirectory="/org.eclipse.emf.teneo.hibernate/src" editDirectory="/org.eclipse.emf.teneo.hibernate.edit/src"
+    editorDirectory="/org.eclipse.emf.teneo.hibernate.editor/src" modelPluginID="org.eclipse.emf.teneo.hibernate"
+    templateDirectory="" redirection="" modelName="HbAnnotation" editPluginClass="org.eclipse.emf.teneo.hibernate.hbannotation.provider.HbAnnotationEditPlugin"
     editorPluginClass="org.eclipse.emf.teneo.hibernate.hbannotation.presentation.HbAnnotationEditorPlugin"
     updateClasspath="false" testSuiteClass="org.eclipse.emf.teneo.hibernate.hbannotation.tests.HbAnnotationAllTests"
     importerID="org.eclipse.emf.importer.ecore" usedGenPackages="../../org.eclipse.emf.teneo.annotations/model/annotations.genmodel#//pamodel ../../org.eclipse.emf.teneo.annotations/model/annotations.genmodel#//pannotation">
@@ -13,22 +13,39 @@
   <genPackages prefix="HbAnnotation" basePackage="org.eclipse.emf.teneo.hibernate"
       disposableProviderFactory="true" ecorePackage="hbannotation.ecore#/">
     <genClasses ecoreClass="hbannotation.ecore#//HbAnnotation"/>
+    <genClasses ecoreClass="hbannotation.ecore#//Cascade">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Cascade/value"/>
+    </genClasses>
     <genClasses ecoreClass="hbannotation.ecore#//CollectionOfElements">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//CollectionOfElements/targetElement"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//CollectionOfElements/fetch"/>
     </genClasses>
-    <genClasses ecoreClass="hbannotation.ecore#//Where">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Where/clause"/>
-    </genClasses>
-    <genClasses ecoreClass="hbannotation.ecore#//Cascade">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Cascade/value"/>
-    </genClasses>
     <genClasses ecoreClass="hbannotation.ecore#//Columns">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbannotation.ecore#//Columns/columns"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbannotation.ecore#//Columns/value"/>
     </genClasses>
     <genClasses ecoreClass="hbannotation.ecore#//MapKey">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbannotation.ecore#//MapKey/columns"/>
     </genClasses>
+    <genClasses ecoreClass="hbannotation.ecore#//Parameter">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Parameter/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Parameter/value"/>
+    </genClasses>
+    <genClasses ecoreClass="hbannotation.ecore#//Type">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Type/type"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbannotation.ecore#//Type/parameters"/>
+    </genClasses>
+    <genClasses ecoreClass="hbannotation.ecore#//Where">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//Where/clause"/>
+    </genClasses>
+    <genClasses ecoreClass="hbannotation.ecore#//IdBag">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//IdBag/generator"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//IdBag/type"/>
+    </genClasses>
+    <genClasses ecoreClass="hbannotation.ecore#//GenericGenerator">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//GenericGenerator/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hbannotation.ecore#//GenericGenerator/strategy"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hbannotation.ecore#//GenericGenerator/parameters"/>
+    </genClasses>
   </genPackages>
   <genPackages prefix="HbModel" basePackage="org.eclipse.emf.teneo.hibernate" disposableProviderFactory="true"
       ecorePackage="hbmodel.ecore#/">
@@ -38,11 +55,16 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEStructuralFeature/hbMapKey"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEStructuralFeature/hbColumns"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEStructuralFeature/hbCascade"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEStructuralFeature/hbIdBag"/>
+    </genClasses>
+    <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEAttribute">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEAttribute/hbType"/>
     </genClasses>
-    <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEAttribute"/>
     <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEClass"/>
     <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEModelElement"/>
-    <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEPackage"/>
+    <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEPackage">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hbmodel.ecore#//HbAnnotatedEPackage/hbGenericGenerators"/>
+    </genClasses>
     <genClasses ecoreClass="hbmodel.ecore#//HbAnnotatedEReference"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/model/hbmodel.ecore b/plugins/org.eclipse.emf.teneo.hibernate/model/hbmodel.ecore
index 4cb978ef1..1dccea1a6 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/model/hbmodel.ecore
+++ b/plugins/org.eclipse.emf.teneo.hibernate/model/hbmodel.ecore
@@ -24,6 +24,9 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEClass" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEClass"/>
   <eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEModelElement" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEPackage" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEPackage"/>
+  <eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEPackage" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEPackage">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="hbGenericGenerators" upperBound="-1"
+        eType="ecore:EClass hbannotation.ecore#//GenericGenerator" containment="true"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="HbAnnotatedEReference" eSuperTypes="../../org.eclipse.emf.teneo.annotations/model/pamodel.ecore#//PAnnotatedEReference #//HbAnnotatedEStructuralFeature"/>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/plugin.properties b/plugins/org.eclipse.emf.teneo.hibernate/plugin.properties
index 7e9a8316b..98811aa31 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/plugin.properties
+++ b/plugins/org.eclipse.emf.teneo.hibernate/plugin.properties
@@ -13,7 +13,7 @@
 # *

 # * </copyright>

 # *

-# * $Id: plugin.properties,v 1.2 2006/08/24 22:12:52 mtaal Exp $

+# * $Id: plugin.properties,v 1.3 2006/08/31 22:47:19 mtaal Exp $

 # */

 

 # NLS_MESSAGEFORMAT_VAR

@@ -34,4 +34,4 @@ Plugin.providerName = Eclipse.org
 # ==============================================================================

 pluginName = HbAnnotation Model

 providerName = www.example.org

-
\ No newline at end of file
+


diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java
index 82bac50e6..a439d04b1 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Cascade.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: Cascade.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -26,6 +26,13 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface Cascade extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Value</b></em>' attribute list.
 	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.CascadeType}.
 	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.annotations.pannotation.CascadeType}.
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java
index 0ab2d4e85..43ffbefe6 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionOfElements.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: CollectionOfElements.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -27,6 +27,13 @@ import org.eclipse.emf.teneo.annotations.pannotation.FetchType;
  */
 public interface CollectionOfElements extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Target Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java
index 60f56a17e..3160f00b3 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Columns.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: Columns.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -26,6 +26,13 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface Columns extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Value</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java
new file mode 100644
index 000000000..4263927e4
--- /dev/null
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java
@@ -0,0 +1,108 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: GenericGenerator.java,v 1.1 2006/08/31 22:47:19 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.hibernate.hbannotation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Generic Generator</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters <em>Parameters</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getGenericGenerator()
+ * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
+ *        annotation="http://annotation.elver.org/internal/Collection name='GenericGenerators' packageNS='http://www.eclipse.org/emf/teneo/2006/HbAnnotation'"
+ * @generated
+ */
+public interface GenericGenerator extends HbAnnotation {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getGenericGenerator_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Strategy</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Strategy</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Strategy</em>' attribute.
+	 * @see #setStrategy(String)
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getGenericGenerator_Strategy()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getStrategy();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Strategy</em>' attribute.
+	 * @see #getStrategy()
+	 * @generated
+	 */
+	void setStrategy(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Parameters</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parameters</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>Parameters</em>' reference list.
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getGenericGenerator_Parameters()
+	 * @model type="org.eclipse.emf.teneo.hibernate.hbannotation.Parameter"
+	 * @generated
+	 */
+	EList getParameters();
+
+} // GenericGenerator
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java
index 694297c35..42e2de726 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotation.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotation.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -20,4 +20,11 @@ import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
  * @generated
  */
 public interface HbAnnotation extends PAnnotation {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
 } // HbAnnotation
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationFactory.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationFactory.java
index 4e6940f34..b89a2a686 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationFactory.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationFactory.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationFactory.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -18,6 +18,13 @@ import org.eclipse.emf.ecore.EFactory;
  */
 public interface HbAnnotationFactory extends EFactory {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -98,6 +105,15 @@ public interface HbAnnotationFactory extends EFactory {
 	IdBag createIdBag();
 
 	/**
+	 * Returns a new object of class '<em>Generic Generator</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Generic Generator</em>'.
+	 * @generated
+	 */
+	GenericGenerator createGenericGenerator();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationPackage.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationPackage.java
index 6b6ee6fc7..357abf045 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationPackage.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotationPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationPackage.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationPackage.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -26,11 +26,18 @@ import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
  * <!-- end-user-doc -->
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationFactory
  * @model kind="package"
- *        annotation="teneo.mapping.source 0='teneo.hibernate:' 1='http://hibernate.elver.org/'"
+ *        annotation="teneo.mapping.source 1='http://hibernate.elver.org/'"
  * @generated
  */
 public interface HbAnnotationPackage extends EPackage {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -98,53 +105,27 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getCollectionOfElements()
 	 * @generated
 	 */
-	int COLLECTION_OF_ELEMENTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLECTION_OF_ELEMENTS__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Target Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLECTION_OF_ELEMENTS__TARGET_ELEMENT = HB_ANNOTATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLECTION_OF_ELEMENTS__FETCH = HB_ANNOTATION_FEATURE_COUNT + 1;
+	int COLLECTION_OF_ELEMENTS = 2;
 
 	/**
-	 * The number of structural features of the '<em>Collection Of Elements</em>' class.
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl <em>Where</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getWhere()
 	 * @generated
-	 * @ordered
 	 */
-	int COLLECTION_OF_ELEMENTS_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
+	int WHERE = 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl <em>Where</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl <em>Cascade</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl
-	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getWhere()
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getCascade()
 	 * @generated
 	 */
-	int WHERE = 2;
+	int CASCADE = 1;
 
 	/**
 	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
@@ -153,62 +134,61 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int WHERE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
+	int CASCADE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Clause</b></em>' attribute.
+	 * The feature id for the '<em><b>Value</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int WHERE__CLAUSE = HB_ANNOTATION_FEATURE_COUNT + 0;
+	int CASCADE__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Where</em>' class.
+	 * The number of structural features of the '<em>Cascade</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int WHERE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
+	int CASCADE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl <em>Cascade</em>}' class.
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl
-	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getCascade()
 	 * @generated
+	 * @ordered
 	 */
-	int CASCADE = 3;
+	int COLLECTION_OF_ELEMENTS__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
+	 * The feature id for the '<em><b>Target Element</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CASCADE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
+	int COLLECTION_OF_ELEMENTS__TARGET_ELEMENT = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute list.
+	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CASCADE__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
+	int COLLECTION_OF_ELEMENTS__FETCH = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Cascade</em>' class.
+	 * The number of structural features of the '<em>Collection Of Elements</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CASCADE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
+	int COLLECTION_OF_ELEMENTS_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ColumnsImpl <em>Columns</em>}' class.
@@ -218,7 +198,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getColumns()
 	 * @generated
 	 */
-	int COLUMNS = 4;
+	int COLUMNS = 3;
 
 	/**
 	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
@@ -255,7 +235,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getMapKey()
 	 * @generated
 	 */
-	int MAP_KEY = 5;
+	int MAP_KEY = 4;
 
 	/**
 	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
@@ -292,7 +272,16 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getParameter()
 	 * @generated
 	 */
-	int PARAMETER = 6;
+	int PARAMETER = 5;
+
+	/**
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -301,7 +290,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER__NAME = 0;
+	int PARAMETER__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -310,7 +299,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER__VALUE = 1;
+	int PARAMETER__VALUE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Parameter</em>' class.
@@ -319,7 +308,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER_FEATURE_COUNT = 2;
+	int PARAMETER_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl <em>Type</em>}' class.
@@ -329,7 +318,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getType()
 	 * @generated
 	 */
-	int TYPE = 7;
+	int TYPE = 6;
 
 	/**
 	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
@@ -368,6 +357,33 @@ public interface HbAnnotationPackage extends EPackage {
 	int TYPE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WHERE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Clause</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WHERE__CLAUSE = HB_ANNOTATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Where</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WHERE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl <em>Id Bag</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -415,6 +431,62 @@ public interface HbAnnotationPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl <em>Generic Generator</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getGenericGenerator()
+	 * @generated
+	 */
+	int GENERIC_GENERATOR = 9;
+
+	/**
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERIC_GENERATOR__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERIC_GENERATOR__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Strategy</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERIC_GENERATOR__STRATEGY = HB_ANNOTATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Parameters</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERIC_GENERATOR__PARAMETERS = HB_ANNOTATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Generic Generator</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERIC_GENERATOR_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 3;
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation <em>Hb Annotation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -637,6 +709,49 @@ public interface HbAnnotationPackage extends EPackage {
 	EAttribute getIdBag_Type();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator <em>Generic Generator</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Generic Generator</em>'.
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator
+	 * @generated
+	 */
+	EClass getGenericGenerator();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName()
+	 * @see #getGenericGenerator()
+	 * @generated
+	 */
+	EAttribute getGenericGenerator_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Strategy</em>'.
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy()
+	 * @see #getGenericGenerator()
+	 * @generated
+	 */
+	EAttribute getGenericGenerator_Strategy();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters <em>Parameters</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Parameters</em>'.
+	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters()
+	 * @see #getGenericGenerator()
+	 * @generated
+	 */
+	EReference getGenericGenerator_Parameters();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -657,7 +772,7 @@ public interface HbAnnotationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	interface Literals {
+	interface Literals  {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation <em>Hb Annotation</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -844,6 +959,40 @@ public interface HbAnnotationPackage extends EPackage {
 		 */
 		EAttribute ID_BAG__TYPE = eINSTANCE.getIdBag_Type();
 
-	}
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl <em>Generic Generator</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl
+		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl#getGenericGenerator()
+		 * @generated
+		 */
+		EClass GENERIC_GENERATOR = eINSTANCE.getGenericGenerator();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute GENERIC_GENERATOR__NAME = eINSTANCE.getGenericGenerator_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Strategy</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute GENERIC_GENERATOR__STRATEGY = eINSTANCE.getGenericGenerator_Strategy();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference GENERIC_GENERATOR__PARAMETERS = eINSTANCE.getGenericGenerator_Parameters();
+
+}
 
 } //HbAnnotationPackage
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java
index dc7b11025..1715f4ac9 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdBag.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: IdBag.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -26,6 +26,13 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
  */
 public interface IdBag extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Generator</b></em>' attribute.
 	 * The default value is <code>"increment"</code>.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java
index 44d8f3edc..a6dba0a8d 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MapKey.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: MapKey.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -26,6 +26,13 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface MapKey extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java
index 2900d001a..b300a20b8 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Parameter.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: Parameter.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -22,10 +22,18 @@ import org.eclipse.emf.ecore.EObject;
  * </p>
  *
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getParameter()
- * @model
+ * @model annotation="http://annotation.elver.org/internal/Collection name='Parameters' packageNS='http://www.eclipse.org/emf/teneo/2006/HbAnnotation'"
+ *        annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
  * @generated
  */
-public interface Parameter extends EObject {
+public interface Parameter extends HbAnnotation {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java
index 5ad156828..fd89e2073 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Type.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: Type.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -27,6 +27,13 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface Type extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java
index 3877fb57e..a2e43b64f 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Where.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: Where.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
@@ -25,6 +25,13 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
  */
 public interface Where extends HbAnnotation {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Clause</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java
index 5405a18fc..5d45a3ad1 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CascadeImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: CascadeImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -42,6 +42,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
  */
 public class CascadeImpl extends EObjectImpl implements Cascade {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java
index 90fdd8731..659a84824 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionOfElementsImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: CollectionOfElementsImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -37,6 +37,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
  */
 public class CollectionOfElementsImpl extends EObjectImpl implements CollectionOfElements {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ColumnsImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ColumnsImpl.java
index 97c6cdb6c..d90663ac6 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ColumnsImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ColumnsImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ColumnsImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: ColumnsImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -44,6 +44,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
  */
 public class ColumnsImpl extends EObjectImpl implements Columns {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java
new file mode 100644
index 000000000..0158d72d9
--- /dev/null
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java
@@ -0,0 +1,320 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: GenericGeneratorImpl.java,v 1.1 2006/08/31 22:47:19 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
+import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Generic Generator</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getEModelElement <em>EModel Element</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getStrategy <em>Strategy</em>}</li>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getParameters <em>Parameters</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class GenericGeneratorImpl extends EObjectImpl implements GenericGenerator {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEModelElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EModelElement eModelElement = null;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getStrategy() <em>Strategy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStrategy()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STRATEGY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStrategy() <em>Strategy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStrategy()
+	 * @generated
+	 * @ordered
+	 */
+	protected String strategy = STRATEGY_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParameters()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList parameters = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected GenericGeneratorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return HbAnnotationPackage.Literals.GENERIC_GENERATOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EModelElement getEModelElement() {
+		if (eModelElement != null && eModelElement.eIsProxy()) {
+			InternalEObject oldEModelElement = (InternalEObject)eModelElement;
+			eModelElement = (EModelElement)eResolveProxy(oldEModelElement);
+			if (eModelElement != oldEModelElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbAnnotationPackage.GENERIC_GENERATOR__EMODEL_ELEMENT, oldEModelElement, eModelElement));
+			}
+		}
+		return eModelElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EModelElement basicGetEModelElement() {
+		return eModelElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEModelElement(EModelElement newEModelElement) {
+		EModelElement oldEModelElement = eModelElement;
+		eModelElement = newEModelElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, HbAnnotationPackage.GENERIC_GENERATOR__EMODEL_ELEMENT, oldEModelElement, eModelElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, HbAnnotationPackage.GENERIC_GENERATOR__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStrategy() {
+		return strategy;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStrategy(String newStrategy) {
+		String oldStrategy = strategy;
+		strategy = newStrategy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, HbAnnotationPackage.GENERIC_GENERATOR__STRATEGY, oldStrategy, strategy));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getParameters() {
+		if (parameters == null) {
+			parameters = new EObjectResolvingEList(Parameter.class, this, HbAnnotationPackage.GENERIC_GENERATOR__PARAMETERS);
+		}
+		return parameters;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case HbAnnotationPackage.GENERIC_GENERATOR__EMODEL_ELEMENT:
+				if (resolve) return getEModelElement();
+				return basicGetEModelElement();
+			case HbAnnotationPackage.GENERIC_GENERATOR__NAME:
+				return getName();
+			case HbAnnotationPackage.GENERIC_GENERATOR__STRATEGY:
+				return getStrategy();
+			case HbAnnotationPackage.GENERIC_GENERATOR__PARAMETERS:
+				return getParameters();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case HbAnnotationPackage.GENERIC_GENERATOR__EMODEL_ELEMENT:
+				setEModelElement((EModelElement)newValue);
+				return;
+			case HbAnnotationPackage.GENERIC_GENERATOR__NAME:
+				setName((String)newValue);
+				return;
+			case HbAnnotationPackage.GENERIC_GENERATOR__STRATEGY:
+				setStrategy((String)newValue);
+				return;
+			case HbAnnotationPackage.GENERIC_GENERATOR__PARAMETERS:
+				getParameters().clear();
+				getParameters().addAll((Collection)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case HbAnnotationPackage.GENERIC_GENERATOR__EMODEL_ELEMENT:
+				setEModelElement((EModelElement)null);
+				return;
+			case HbAnnotationPackage.GENERIC_GENERATOR__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case HbAnnotationPackage.GENERIC_GENERATOR__STRATEGY:
+				setStrategy(STRATEGY_EDEFAULT);
+				return;
+			case HbAnnotationPackage.GENERIC_GENERATOR__PARAMETERS:
+				getParameters().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case HbAnnotationPackage.GENERIC_GENERATOR__EMODEL_ELEMENT:
+				return eModelElement != null;
+			case HbAnnotationPackage.GENERIC_GENERATOR__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case HbAnnotationPackage.GENERIC_GENERATOR__STRATEGY:
+				return STRATEGY_EDEFAULT == null ? strategy != null : !STRATEGY_EDEFAULT.equals(strategy);
+			case HbAnnotationPackage.GENERIC_GENERATOR__PARAMETERS:
+				return parameters != null && !parameters.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", strategy: ");
+		result.append(strategy);
+		result.append(')');
+		return result.toString();
+	}
+
+} //GenericGeneratorImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java
index 2fca26451..7aec7f85f 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationFactoryImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationFactoryImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -24,6 +24,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.*;
  */
 public class HbAnnotationFactoryImpl extends EFactoryImpl implements HbAnnotationFactory {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -59,14 +66,15 @@ public class HbAnnotationFactoryImpl extends EFactoryImpl implements HbAnnotatio
 	 */
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case HbAnnotationPackage.COLLECTION_OF_ELEMENTS: return createCollectionOfElements();
-			case HbAnnotationPackage.WHERE: return createWhere();
 			case HbAnnotationPackage.CASCADE: return createCascade();
+			case HbAnnotationPackage.COLLECTION_OF_ELEMENTS: return createCollectionOfElements();
 			case HbAnnotationPackage.COLUMNS: return createColumns();
 			case HbAnnotationPackage.MAP_KEY: return createMapKey();
 			case HbAnnotationPackage.PARAMETER: return createParameter();
 			case HbAnnotationPackage.TYPE: return createType();
+			case HbAnnotationPackage.WHERE: return createWhere();
 			case HbAnnotationPackage.ID_BAG: return createIdBag();
+			case HbAnnotationPackage.GENERIC_GENERATOR: return createGenericGenerator();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -157,6 +165,16 @@ public class HbAnnotationFactoryImpl extends EFactoryImpl implements HbAnnotatio
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public GenericGenerator createGenericGenerator() {
+		GenericGeneratorImpl genericGenerator = new GenericGeneratorImpl();
+		return genericGenerator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public HbAnnotationPackage getHbAnnotationPackage() {
 		return (HbAnnotationPackage)getEPackage();
 	}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationPackageImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationPackageImpl.java
index 50153e308..8a483986b 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationPackageImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationPackageImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -11,16 +11,13 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EValidator;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
-
 import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
 import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Columns;
+import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationFactory;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
@@ -29,11 +26,8 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.util.HbAnnotationValidator;
-
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
-
 import org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbModelPackageImpl;
 
 /**
@@ -48,6 +42,13 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass hbAnnotationEClass = null;
 
 	/**
@@ -107,6 +108,13 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 	private EClass idBagEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass genericGeneratorEClass = 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.
@@ -386,6 +394,42 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getGenericGenerator() {
+		return genericGeneratorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getGenericGenerator_Name() {
+		return (EAttribute)genericGeneratorEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getGenericGenerator_Strategy() {
+		return (EAttribute)genericGeneratorEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getGenericGenerator_Parameters() {
+		return (EReference)genericGeneratorEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public HbAnnotationFactory getHbAnnotationFactory() {
 		return (HbAnnotationFactory)getEFactoryInstance();
 	}
@@ -411,16 +455,13 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		// Create classes and their features
 		hbAnnotationEClass = createEClass(HB_ANNOTATION);
 
+		cascadeEClass = createEClass(CASCADE);
+		createEAttribute(cascadeEClass, CASCADE__VALUE);
+
 		collectionOfElementsEClass = createEClass(COLLECTION_OF_ELEMENTS);
 		createEAttribute(collectionOfElementsEClass, COLLECTION_OF_ELEMENTS__TARGET_ELEMENT);
 		createEAttribute(collectionOfElementsEClass, COLLECTION_OF_ELEMENTS__FETCH);
 
-		whereEClass = createEClass(WHERE);
-		createEAttribute(whereEClass, WHERE__CLAUSE);
-
-		cascadeEClass = createEClass(CASCADE);
-		createEAttribute(cascadeEClass, CASCADE__VALUE);
-
 		columnsEClass = createEClass(COLUMNS);
 		createEReference(columnsEClass, COLUMNS__VALUE);
 
@@ -435,9 +476,17 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		createEAttribute(typeEClass, TYPE__TYPE);
 		createEReference(typeEClass, TYPE__PARAMETERS);
 
+		whereEClass = createEClass(WHERE);
+		createEAttribute(whereEClass, WHERE__CLAUSE);
+
 		idBagEClass = createEClass(ID_BAG);
 		createEAttribute(idBagEClass, ID_BAG__GENERATOR);
 		createEAttribute(idBagEClass, ID_BAG__TYPE);
+
+		genericGeneratorEClass = createEClass(GENERIC_GENERATOR);
+		createEAttribute(genericGeneratorEClass, GENERIC_GENERATOR__NAME);
+		createEAttribute(genericGeneratorEClass, GENERIC_GENERATOR__STRATEGY);
+		createEReference(genericGeneratorEClass, GENERIC_GENERATOR__PARAMETERS);
 	}
 
 	/**
@@ -468,27 +517,26 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 
 		// Add supertypes to classes
 		hbAnnotationEClass.getESuperTypes().add(thePannotationPackage.getPAnnotation());
-		collectionOfElementsEClass.getESuperTypes().add(this.getHbAnnotation());
-		whereEClass.getESuperTypes().add(this.getHbAnnotation());
 		cascadeEClass.getESuperTypes().add(this.getHbAnnotation());
+		collectionOfElementsEClass.getESuperTypes().add(this.getHbAnnotation());
 		columnsEClass.getESuperTypes().add(this.getHbAnnotation());
 		mapKeyEClass.getESuperTypes().add(this.getHbAnnotation());
+		parameterEClass.getESuperTypes().add(this.getHbAnnotation());
 		typeEClass.getESuperTypes().add(this.getHbAnnotation());
+		whereEClass.getESuperTypes().add(this.getHbAnnotation());
 		idBagEClass.getESuperTypes().add(this.getHbAnnotation());
+		genericGeneratorEClass.getESuperTypes().add(this.getHbAnnotation());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(hbAnnotationEClass, HbAnnotation.class, "HbAnnotation", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(cascadeEClass, Cascade.class, "Cascade", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCascade_Value(), thePannotationPackage.getCascadeType(), "value", null, 0, -1, Cascade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(collectionOfElementsEClass, CollectionOfElements.class, "CollectionOfElements", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCollectionOfElements_TargetElement(), ecorePackage.getEString(), "targetElement", null, 0, 1, CollectionOfElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCollectionOfElements_Fetch(), thePannotationPackage.getFetchType(), "fetch", "LAZY", 0, 1, CollectionOfElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(whereEClass, Where.class, "Where", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWhere_Clause(), ecorePackage.getEString(), "clause", null, 0, 1, Where.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(cascadeEClass, Cascade.class, "Cascade", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCascade_Value(), thePannotationPackage.getCascadeType(), "value", null, 0, -1, Cascade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(columnsEClass, Columns.class, "Columns", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getColumns_Value(), thePannotationPackage.getColumn(), null, "value", null, 0, -1, Columns.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -503,10 +551,18 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		initEAttribute(getType_Type(), ecorePackage.getEString(), "type", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getType_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(whereEClass, Where.class, "Where", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getWhere_Clause(), ecorePackage.getEString(), "clause", null, 0, 1, Where.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(idBagEClass, IdBag.class, "IdBag", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIdBag_Generator(), ecorePackage.getEString(), "generator", "increment", 0, 1, IdBag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getIdBag_Type(), ecorePackage.getEString(), "type", "long", 0, 1, IdBag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(genericGeneratorEClass, GenericGenerator.class, "GenericGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getGenericGenerator_Name(), ecorePackage.getEString(), "name", null, 1, 1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getGenericGenerator_Strategy(), ecorePackage.getEString(), "strategy", null, 1, 1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getGenericGenerator_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 
@@ -517,6 +573,8 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		createEcoreAnnotations();
 		// http://annotation.elver.org/internal/Target
 		createTargetAnnotations();
+		// http://annotation.elver.org/internal/Collection
+		createCollectionAnnotations();
 	}
 
 	/**
@@ -531,9 +589,8 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		  (this, 
 		   source, 
 		   new String[] {
-			 "0", "teneo.hibernate:",
 			 "1", "http://hibernate.elver.org/"
-		   });								
+		   });												
 	}
 
 	/**
@@ -549,7 +606,7 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		   source, 
 		   new String[] {
 			 "constraints", "CompatibleEModelElementType AnnotationIsSupported"
-		   });							
+		   });											
 	}
 
 	/**
@@ -583,6 +640,14 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		   source, 
 		   new String[] {
 			 "0", "EStructuralFeature"
+		   });			
+		addAnnotation
+		  (parameterEClass, 
+		   source, 
+		   new String[] {
+			 "0", "EStructuralFeature",
+			 "1", "EClass",
+			 "2", "EPackage"
 		   });		
 		addAnnotation
 		  (typeEClass, 
@@ -601,6 +666,38 @@ public class HbAnnotationPackageImpl extends EPackageImpl implements HbAnnotatio
 		   source, 
 		   new String[] {
 			 "0", "EStructuralFeature"
+		   });		
+		addAnnotation
+		  (genericGeneratorEClass, 
+		   source, 
+		   new String[] {
+			 "0", "EStructuralFeature",
+			 "1", "EClass",
+			 "2", "EPackage"
+		   });	
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://annotation.elver.org/internal/Collection</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createCollectionAnnotations() {
+		String source = "http://annotation.elver.org/internal/Collection";								
+		addAnnotation
+		  (parameterEClass, 
+		   source, 
+		   new String[] {
+			 "name", "Parameters",
+			 "packageNS", "http://www.eclipse.org/emf/teneo/2006/HbAnnotation"
+		   });							
+		addAnnotation
+		  (genericGeneratorEClass, 
+		   source, 
+		   new String[] {
+			 "name", "GenericGenerators",
+			 "packageNS", "http://www.eclipse.org/emf/teneo/2006/HbAnnotation"
 		   });
 	}
 
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java
index fb56ccdb8..b6005af33 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdBagImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: IdBagImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -35,6 +35,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
  */
 public class IdBagImpl extends EObjectImpl implements IdBag {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyImpl.java
index fdccb27d8..4853bff59 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MapKeyImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: MapKeyImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -44,6 +44,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
  */
 public class MapKeyImpl extends EObjectImpl implements MapKey {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java
index 468f2cc74..028a5d9a2 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParameterImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: ParameterImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -10,6 +10,9 @@ import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
@@ -23,6 +26,7 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getEModelElement <em>EModel Element</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getValue <em>Value</em>}</li>
  * </ul>
@@ -32,6 +36,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
  */
 public class ParameterImpl extends EObjectImpl implements Parameter {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEModelElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EModelElement eModelElement = null;
+
+	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -94,6 +115,44 @@ public class ParameterImpl extends EObjectImpl implements Parameter {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EModelElement getEModelElement() {
+		if (eModelElement != null && eModelElement.eIsProxy()) {
+			InternalEObject oldEModelElement = (InternalEObject)eModelElement;
+			eModelElement = (EModelElement)eResolveProxy(oldEModelElement);
+			if (eModelElement != oldEModelElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbAnnotationPackage.PARAMETER__EMODEL_ELEMENT, oldEModelElement, eModelElement));
+			}
+		}
+		return eModelElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EModelElement basicGetEModelElement() {
+		return eModelElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEModelElement(EModelElement newEModelElement) {
+		EModelElement oldEModelElement = eModelElement;
+		eModelElement = newEModelElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, HbAnnotationPackage.PARAMETER__EMODEL_ELEMENT, oldEModelElement, eModelElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getName() {
 		return name;
 	}
@@ -138,6 +197,9 @@ public class ParameterImpl extends EObjectImpl implements Parameter {
 	 */
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case HbAnnotationPackage.PARAMETER__EMODEL_ELEMENT:
+				if (resolve) return getEModelElement();
+				return basicGetEModelElement();
 			case HbAnnotationPackage.PARAMETER__NAME:
 				return getName();
 			case HbAnnotationPackage.PARAMETER__VALUE:
@@ -153,6 +215,9 @@ public class ParameterImpl extends EObjectImpl implements Parameter {
 	 */
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case HbAnnotationPackage.PARAMETER__EMODEL_ELEMENT:
+				setEModelElement((EModelElement)newValue);
+				return;
 			case HbAnnotationPackage.PARAMETER__NAME:
 				setName((String)newValue);
 				return;
@@ -170,6 +235,9 @@ public class ParameterImpl extends EObjectImpl implements Parameter {
 	 */
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case HbAnnotationPackage.PARAMETER__EMODEL_ELEMENT:
+				setEModelElement((EModelElement)null);
+				return;
 			case HbAnnotationPackage.PARAMETER__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -187,6 +255,8 @@ public class ParameterImpl extends EObjectImpl implements Parameter {
 	 */
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case HbAnnotationPackage.PARAMETER__EMODEL_ELEMENT:
+				return eModelElement != null;
 			case HbAnnotationPackage.PARAMETER__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case HbAnnotationPackage.PARAMETER__VALUE:
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java
index 017b2d7c5..a4f6112af 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TypeImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: TypeImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -42,6 +42,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
  */
 public class TypeImpl extends EObjectImpl implements Type {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java
index 502484087..a1ed6c34e 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: WhereImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: WhereImpl.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
 
@@ -34,6 +34,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
  */
 public class WhereImpl extends EObjectImpl implements Where {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getEModelElement() <em>EModel Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java
index d193ee44a..ffa3effe1 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationAdapterFactory.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationAdapterFactory.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
@@ -27,6 +27,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.*;
  */
 public class HbAnnotationAdapterFactory extends AdapterFactoryImpl {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -75,15 +82,12 @@ public class HbAnnotationAdapterFactory extends AdapterFactoryImpl {
 			public Object caseHbAnnotation(HbAnnotation object) {
 				return createHbAnnotationAdapter();
 			}
-			public Object caseCollectionOfElements(CollectionOfElements object) {
-				return createCollectionOfElementsAdapter();
-			}
-			public Object caseWhere(Where object) {
-				return createWhereAdapter();
-			}
 			public Object caseCascade(Cascade object) {
 				return createCascadeAdapter();
 			}
+			public Object caseCollectionOfElements(CollectionOfElements object) {
+				return createCollectionOfElementsAdapter();
+			}
 			public Object caseColumns(Columns object) {
 				return createColumnsAdapter();
 			}
@@ -96,9 +100,15 @@ public class HbAnnotationAdapterFactory extends AdapterFactoryImpl {
 			public Object caseType(Type object) {
 				return createTypeAdapter();
 			}
+			public Object caseWhere(Where object) {
+				return createWhereAdapter();
+			}
 			public Object caseIdBag(IdBag object) {
 				return createIdBagAdapter();
 			}
+			public Object caseGenericGenerator(GenericGenerator object) {
+				return createGenericGeneratorAdapter();
+			}
 			public Object casePAnnotation(PAnnotation object) {
 				return createPAnnotationAdapter();
 			}
@@ -247,6 +257,20 @@ public class HbAnnotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator <em>Generic Generator</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.hibernate.hbannotation.GenericGenerator
+	 * @generated
+	 */
+	public Adapter createGenericGeneratorAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pannotation.PAnnotation <em>PAnnotation</em>}'.
 	 * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationImporter.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationImporter.java
index 34356b23a..fd9a24506 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationImporter.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationImporter.java
@@ -1,3 +1,19 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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:
+ *   Douglas Bitting
+ * </copyright>
+ *
+ * $Id: HbAnnotationImporter.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
+ */
+
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
 import java.util.Collection;
@@ -9,70 +25,63 @@ import org.eclipse.emf.teneo.annotations.pannotation.util.EAnnotationImporter;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
 
 /**
- * This class interprets the annotation importing process based on the
- * hibernate.elver.org annotation model. The main difference between this and
- * EAnnotationImporter is that this class understands that hibernate annotations
- * begin with http://hibernate.elver.org/.
+ * This class interprets the annotation importing process based on the hibernate.elver.org annotation model. The main
+ * difference between this and EAnnotationImporter is that this class understands that hibernate annotations begin with
+ * http://hibernate.elver.org/ or teneo.hibernate:.
  */
 public class HbAnnotationImporter extends EAnnotationImporter {
 
-    public HbAnnotationImporter(Handler handler) {
-        super(handler);
-    }
-
-    private final boolean isHbAnnotation(EAnnotation eAnnotation) {
-        return isHbAnnotation(eAnnotation.getSource());
-    }
-
-    private final boolean isHbAnnotation(final String source) {
-        return null != getHbPrefix(source);
-    }
+	/** Constructor */
+	public HbAnnotationImporter(Handler handler) {
+		super(handler);
+	}
 
-    protected EClass getElverAnnotationEClass(EAnnotation eAnnotation) {
-        return (isHbAnnotation(eAnnotation)) ? getEClass(eAnnotation
-                .getSource(), getHbPrefix(eAnnotation.getSource()),
-                HbAnnotationPackage.eINSTANCE) : super
-                .getElverAnnotationEClass(eAnnotation);
-    }
+	/** Returns true if this is a hbAnnotation */
+	private final boolean isHbAnnotation(EAnnotation eAnnotation) {
+		return isHbAnnotation(eAnnotation.getSource());
+	}
 
-    protected String getElverSubordinateId(EAnnotation eAnnotation) {
-        return (isHbAnnotation(eAnnotation)) ? getSubordinateId(eAnnotation,
-                getHbPrefix(eAnnotation.getSource())) : super
-                .getElverSubordinateId(eAnnotation);
-    }
+	/** Returns true if this is a hbAnnotation */
+	private final boolean isHbAnnotation(final String source) {
+		return null != getHbPrefix(source);
+	}
 
-    protected boolean isElverAnnotationSource(String source) {
-        return (isHbAnnotation(source) || super.isElverAnnotationSource(source));
+	/**
+	 * Return the hbAnnotation EClass if this is an hb eannotation, otherwise redirect to superclass
+	 */
+	public EClass getPAnnotationEClass(EAnnotation eAnnotation) {
+    	if (isHbAnnotation(eAnnotation)) { 
+    		final EClass eclass = getEClass(eAnnotation.getSource(), 
+    				getHbPrefix(eAnnotation.getSource()),
+                HbAnnotationPackage.eINSTANCE);
+    		return eclass;
+    	} else {
+    		return super.getPAnnotationEClass(eAnnotation);
+    	}
     }
 
-    protected boolean isElverSubordinate(EAnnotation eAnnotation) {
-        final String prefix = getPrefix(eAnnotation.getSource());
-        if (isHbAnnotation(eAnnotation)) {
-            String annotationName =
-                    eAnnotation.getSource().substring(prefix.length());
-            return annotationName.indexOf('/') != -1;
-        }
-        return super.isElverSubordinate(eAnnotation);
-    }
+	/** Returns the prefixes, first tries the hibernate prefixes and then the general prefixes */
+	protected String getPrefix(String source) {
+		String result = getHbPrefix(source);
+		return (null == result) ? super.getPrefix(source) : result;
+	}
 
-    protected String getPrefix(String source) {
-        String result = getHbPrefix(source);
-        return (null == result) ? super.getPrefix(source) : result;
-    }
-
-    private String getHbPrefix(String source) {
-        if (source == null) {
-            return null;
-        }
-        final Collection prefixes =
-                HbAnnotationPackage.eINSTANCE.getEAnnotation(
-                        "teneo.mapping.source").getDetails().values();
-        for (Iterator iter = prefixes.iterator(); iter.hasNext();) {
-            String prefix = (String) iter.next();
-            if (source.startsWith(prefix)) {
-                return prefix;
-            }
-        }
-        return null;
-    }
-}
+	/**
+	 * Returns the prefix of the annotation source, search uses using the prefixes defined in the annotation
+	 * teneo.mapping.source on the epackage
+	 */
+	private String getHbPrefix(String source) {
+		if (source == null) {
+			return null;
+		}
+		final Collection prefixes = HbAnnotationPackage.eINSTANCE.getEAnnotation("teneo.mapping.source").getDetails()
+				.values();
+		for (Iterator iter = prefixes.iterator(); iter.hasNext();) {
+			String prefix = (String) iter.next();
+			if (source.startsWith(prefix)) {
+				return prefix;
+			}
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationModelBuilder.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationModelBuilder.java
index 7dc9b80da..62759a3e2 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationModelBuilder.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationModelBuilder.java
@@ -1,15 +1,33 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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:
+ *   Douglas Bitting
+ * </copyright>
+ *
+ * $Id: HbAnnotationModelBuilder.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
+ */
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
+import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
 import org.eclipse.emf.teneo.annotations.pamodel.util.EannotationPamodelBuilder;
 import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
 import org.eclipse.emf.teneo.annotations.pannotation.util.EAnnotationImporter;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelFactory;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
 
 /**
  * This class create the Hibernate-model versions of the various PaAnnotatedE* objects. 
@@ -32,6 +50,20 @@ public class HbAnnotationModelBuilder extends EannotationPamodelBuilder {
 			});
 	}
 
+	/**
+	 * Add the given annotation to the given PAnnotatedEModelElement.
+	 * @throws IllegalArgumentException if the given PAnnotation
+	 * is not admitted for the given PAnnotatedEModelElement.
+	 */
+	protected void setPAnnotation(PAnnotatedEModelElement pElement, PAnnotation pAnnotation) {
+		EReference pAnnotationRef = HbModelPackage.eINSTANCE.pAnnotationReference(pElement.eClass(), pAnnotation.eClass());
+		if (pAnnotationRef == null) {
+			super.setPAnnotation(pElement, pAnnotation);
+		} else {
+			pElement.eSet(pAnnotationRef, pAnnotation);
+		}
+	}
+
 	protected PAnnotatedEModelElement doCreate(EModelElement eModelElement) throws AssertionError {
 		final EClass eModelElementEClass = eModelElement.eClass();
 		PAnnotatedEModelElement paElement;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java
index 3005c9743..18ad6af2c 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationSwitch.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationSwitch.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
@@ -30,6 +30,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.*;
  */
 public class HbAnnotationSwitch {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -96,22 +103,6 @@ public class HbAnnotationSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case HbAnnotationPackage.COLLECTION_OF_ELEMENTS: {
-				CollectionOfElements collectionOfElements = (CollectionOfElements)theEObject;
-				Object result = caseCollectionOfElements(collectionOfElements);
-				if (result == null) result = caseHbAnnotation(collectionOfElements);
-				if (result == null) result = casePAnnotation(collectionOfElements);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbAnnotationPackage.WHERE: {
-				Where where = (Where)theEObject;
-				Object result = caseWhere(where);
-				if (result == null) result = caseHbAnnotation(where);
-				if (result == null) result = casePAnnotation(where);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case HbAnnotationPackage.CASCADE: {
 				Cascade cascade = (Cascade)theEObject;
 				Object result = caseCascade(cascade);
@@ -120,6 +111,14 @@ public class HbAnnotationSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case HbAnnotationPackage.COLLECTION_OF_ELEMENTS: {
+				CollectionOfElements collectionOfElements = (CollectionOfElements)theEObject;
+				Object result = caseCollectionOfElements(collectionOfElements);
+				if (result == null) result = caseHbAnnotation(collectionOfElements);
+				if (result == null) result = casePAnnotation(collectionOfElements);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case HbAnnotationPackage.COLUMNS: {
 				Columns columns = (Columns)theEObject;
 				Object result = caseColumns(columns);
@@ -139,6 +138,8 @@ public class HbAnnotationSwitch {
 			case HbAnnotationPackage.PARAMETER: {
 				Parameter parameter = (Parameter)theEObject;
 				Object result = caseParameter(parameter);
+				if (result == null) result = caseHbAnnotation(parameter);
+				if (result == null) result = casePAnnotation(parameter);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -150,6 +151,14 @@ public class HbAnnotationSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case HbAnnotationPackage.WHERE: {
+				Where where = (Where)theEObject;
+				Object result = caseWhere(where);
+				if (result == null) result = caseHbAnnotation(where);
+				if (result == null) result = casePAnnotation(where);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case HbAnnotationPackage.ID_BAG: {
 				IdBag idBag = (IdBag)theEObject;
 				Object result = caseIdBag(idBag);
@@ -158,6 +167,14 @@ public class HbAnnotationSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case HbAnnotationPackage.GENERIC_GENERATOR: {
+				GenericGenerator genericGenerator = (GenericGenerator)theEObject;
+				Object result = caseGenericGenerator(genericGenerator);
+				if (result == null) result = caseHbAnnotation(genericGenerator);
+				if (result == null) result = casePAnnotation(genericGenerator);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -298,6 +315,21 @@ public class HbAnnotationSwitch {
 	}
 
 	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Generic Generator</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 interpretting the object as an instance of '<em>Generic Generator</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseGenericGenerator(GenericGenerator object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpretting the object as an instance of '<em>PAnnotation</em>'.
 	 * <!-- begin-user-doc -->
      * This implementation returns null;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java
index 5dc331296..0361ae3d5 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotationValidator.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotationValidator.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
@@ -31,6 +31,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.*;
  */
 public class HbAnnotationValidator extends EObjectValidator {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -103,12 +110,10 @@ public class HbAnnotationValidator extends EObjectValidator {
 		switch (classifierID) {
 			case HbAnnotationPackage.HB_ANNOTATION:
 				return validateHbAnnotation((HbAnnotation)value, diagnostics, context);
-			case HbAnnotationPackage.COLLECTION_OF_ELEMENTS:
-				return validateCollectionOfElements((CollectionOfElements)value, diagnostics, context);
-			case HbAnnotationPackage.WHERE:
-				return validateWhere((Where)value, diagnostics, context);
 			case HbAnnotationPackage.CASCADE:
 				return validateCascade((Cascade)value, diagnostics, context);
+			case HbAnnotationPackage.COLLECTION_OF_ELEMENTS:
+				return validateCollectionOfElements((CollectionOfElements)value, diagnostics, context);
 			case HbAnnotationPackage.COLUMNS:
 				return validateColumns((Columns)value, diagnostics, context);
 			case HbAnnotationPackage.MAP_KEY:
@@ -117,8 +122,12 @@ public class HbAnnotationValidator extends EObjectValidator {
 				return validateParameter((Parameter)value, diagnostics, context);
 			case HbAnnotationPackage.TYPE:
 				return validateType((Type)value, diagnostics, context);
+			case HbAnnotationPackage.WHERE:
+				return validateWhere((Where)value, diagnostics, context);
 			case HbAnnotationPackage.ID_BAG:
 				return validateIdBag((IdBag)value, diagnostics, context);
+			case HbAnnotationPackage.GENERIC_GENERATOR:
+				return validateGenericGenerator((GenericGenerator)value, diagnostics, context);
 			default: 
 				return true;
 		}
@@ -274,7 +283,13 @@ public class HbAnnotationValidator extends EObjectValidator {
 	 * @generated
 	 */
     public boolean validateParameter(Parameter parameter, DiagnosticChain diagnostics, Map context) {
-		return validate_EveryDefaultConstraint(parameter, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(parameter, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(parameter, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(parameter, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(parameter, diagnostics, context);
+		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(parameter, diagnostics, context);
+		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(parameter, diagnostics, context);
+		return result;
 	}
 
 	/**
@@ -307,4 +322,19 @@ public class HbAnnotationValidator extends EObjectValidator {
 		return result;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateGenericGenerator(GenericGenerator genericGenerator, DiagnosticChain diagnostics, Map context) {
+		boolean result = validate_EveryMultiplicityConforms(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(genericGenerator, diagnostics, context);
+		return result;
+	}
+
 } //HbAnnotationValidator
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbEAnnotationParserImporter.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbEAnnotationParserImporter.java
new file mode 100644
index 000000000..74d956d3e
--- /dev/null
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbEAnnotationParserImporter.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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: HbEAnnotationParserImporter.java,v 1.1 2006/08/31 22:47:19 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.hibernate.hbannotation.util;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.teneo.annotations.parser.EAnnotationParserImporter;
+import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
+
+/**
+ * Overrides the default EAnnotationParserImporter to add a hibernate source
+ */
+public class HbEAnnotationParserImporter extends EAnnotationParserImporter {
+
+	/** Returns true if the source is a hibernate source or a generic source */
+	protected boolean isValidSource(String source) {
+		if (source == null) return false;
+		return source.startsWith("teneo.hibernate") || super.isValidSource(source);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.emf.teneo.annotations.parser.EClassResolver#getEClass(java.lang.String)
+	 */
+	public EClass getEClass(String name) {
+		final EClass eClass = (EClass)HbAnnotationPackage.eINSTANCE.getEClassifier(name);
+		if (eClass == null) {
+			return super.getEClass(name);
+		}
+		return eClass;
+	}
+}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HibernateDefaultAnnotator.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HibernateDefaultAnnotator.java
index ad67ae766..ad49d6596 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HibernateDefaultAnnotator.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HibernateDefaultAnnotator.java
@@ -1,3 +1,18 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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:
+ *   Douglas Bitting
+ * </copyright>
+ *
+ * $Id: HibernateDefaultAnnotator.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
+ */
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/MappingBuilder.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/MappingBuilder.java
index f671b9354..6bb498e79 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/MappingBuilder.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/MappingBuilder.java
@@ -1,15 +1,31 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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:
+ *   Douglas Bitting
+ * </copyright>
+ *
+ * $Id: MappingBuilder.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
+ */
 package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
 import org.eclipse.emf.teneo.annotations.pamodel.util.BasicPamodelBuilder;
 import org.eclipse.emf.teneo.annotations.pamodel.util.EannotationPamodelBuilder;
+import org.eclipse.emf.teneo.annotations.parser.EAnnotationParserImporter;
 import org.eclipse.emf.teneo.mapper.DefaultAnnotator;
-import org.eclipse.emf.teneo.mapper.PersistenceMappingBuilderImpl;
+import org.eclipse.emf.teneo.mapper.PersistenceMappingBuilder;
 
 /**
  * This class simply provides the Hibernate-equivalent builders to the
  * generic Elver annotation processing mechanism.
  */
-public class MappingBuilder extends PersistenceMappingBuilderImpl {
+public class MappingBuilder extends PersistenceMappingBuilder {
 
 	public static final MappingBuilder INSTANCE = new MappingBuilder();
 	
@@ -24,4 +40,10 @@ public class MappingBuilder extends PersistenceMappingBuilderImpl {
 	protected DefaultAnnotator getDefaultAnnotator() {
 		return new HibernateDefaultAnnotator();
 	}
+	
+	/** Return a java annotation parser */
+	protected EAnnotationParserImporter getEAnnotationParserImporter() {
+		return new HbEAnnotationParserImporter();
+	}
+
 }
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java
index 53381cecb..d7e9dc1ee 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java
@@ -2,12 +2,11 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEAttribute.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEAttribute.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 
 /**
@@ -28,6 +27,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
  */
 public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotatedEStructuralFeature {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java
index e256db2df..c937cd685 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEClass.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEClass.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
@@ -19,4 +19,11 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
  * @generated
  */
 public interface HbAnnotatedEClass extends PAnnotatedEClass {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
 } // HbAnnotatedEClass
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java
index 9a6e9c261..55d40028c 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEModelElement.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEModelElement.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
@@ -19,4 +19,11 @@ import org.eclipse.emf.ecore.EObject;
  * @generated
  */
 public interface HbAnnotatedEModelElement extends EObject {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
 } // HbAnnotatedEModelElement
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java
index 37f9327fd..03fbcdac2 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java
@@ -2,10 +2,11 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEPackage.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEPackage.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
 
 /**
@@ -13,10 +14,39 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
  * A representation of the model object '<em><b>Hb Annotated EPackage</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators <em>Hb Generic Generators</em>}</li>
+ * </ul>
+ * </p>
  *
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage#getHbAnnotatedEPackage()
  * @model
  * @generated
  */
 public interface HbAnnotatedEPackage extends PAnnotatedEPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * Returns the value of the '<em><b>Hb Generic Generators</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hb Generic Generators</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Hb Generic Generators</em>' containment reference list.
+	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage#getHbAnnotatedEPackage_HbGenericGenerators()
+	 * @model type="org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator" containment="true"
+	 * @generated
+	 */
+	EList getHbGenericGenerators();
+
 } // HbAnnotatedEPackage
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
index 3b89bc735..78f815b2e 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEReference.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEReference.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
@@ -19,4 +19,11 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
  * @generated
  */
 public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotatedEStructuralFeature {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
 } // HbAnnotatedEReference
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEStructuralFeature.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEStructuralFeature.java
index dc2663684..75fb863b0 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEStructuralFeature.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEStructuralFeature.java
@@ -2,12 +2,11 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEStructuralFeature.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEStructuralFeature.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
 import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Columns;
@@ -38,6 +37,13 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
  */
 public interface HbAnnotatedEStructuralFeature extends PAnnotatedEStructuralFeature, HbAnnotatedEModelElement {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelFactory.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelFactory.java
index 09e36bf26..3f2089400 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelFactory.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbModelFactory.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbModelFactory.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
@@ -18,6 +18,13 @@ import org.eclipse.emf.ecore.EFactory;
  */
 public interface HbModelFactory extends EFactory {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelPackage.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelPackage.java
index f18adad5e..bf7f5161f 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelPackage.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbModelPackage.java
@@ -2,14 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbModelPackage.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbModelPackage.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
 
 /**
@@ -29,6 +28,13 @@ import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
  */
 public interface HbModelPackage extends EPackage {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -188,6 +194,24 @@ public interface HbModelPackage extends EPackage {
 	int HB_ANNOTATED_ESTRUCTURAL_FEATURE__COLUMN = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN;
 
 	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_ATTRIBUTE_OVERRIDES;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PARSED_JOIN_COLUMNS;
+
+	/**
 	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -378,6 +402,24 @@ public interface HbModelPackage extends EPackage {
 	int HB_ANNOTATED_EATTRIBUTE__COLUMN = PamodelPackage.PANNOTATED_EATTRIBUTE__COLUMN;
 
 	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_EATTRIBUTE__PARSED_ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_EATTRIBUTE__PARSED_ATTRIBUTE_OVERRIDES;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_EATTRIBUTE__PARSED_JOIN_COLUMNS = PamodelPackage.PANNOTATED_EATTRIBUTE__PARSED_JOIN_COLUMNS;
+
+	/**
 	 * The feature id for the '<em><b>Annotated EAttribute</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -667,40 +709,49 @@ public interface HbModelPackage extends EPackage {
 	int HB_ANNOTATED_ECLASS__SECONDARY_TABLES = PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
+	 * The feature id for the '<em><b>Table</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HB_ANNOTATED_ECLASS__SEQUENCE_GENERATOR = PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATOR;
+	int HB_ANNOTATED_ECLASS__TABLE = PamodelPackage.PANNOTATED_ECLASS__TABLE;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference.
+	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HB_ANNOTATED_ECLASS__TABLE = PamodelPackage.PANNOTATED_ECLASS__TABLE;
+	int HB_ANNOTATED_ECLASS__TABLE_GENERATOR = PamodelPackage.PANNOTATED_ECLASS__TABLE_GENERATOR;
 
 	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
+	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HB_ANNOTATED_ECLASS__TABLE_GENERATOR = PamodelPackage.PANNOTATED_ECLASS__TABLE_GENERATOR;
+	int HB_ANNOTATED_ECLASS__ASSOCIATION_OVERRIDES = PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference.
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HB_ANNOTATED_ECLASS__ASSOCIATION_OVERRIDES = PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES;
+	int HB_ANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_ECLASS__PARSED_ATTRIBUTE_OVERRIDES;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Association Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES = PamodelPackage.PANNOTATED_ECLASS__PARSED_ASSOCIATION_OVERRIDES;
 
 	/**
 	 * The number of structural features of the '<em>Hb Annotated EClass</em>' class.
@@ -786,7 +837,7 @@ public interface HbModelPackage extends EPackage {
 	int HB_ANNOTATED_EPACKAGE__PA_ECLASSES = PamodelPackage.PANNOTATED_EPACKAGE__PA_ECLASSES;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
+	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -804,13 +855,22 @@ public interface HbModelPackage extends EPackage {
 	int HB_ANNOTATED_EPACKAGE__TABLE_GENERATOR = PamodelPackage.PANNOTATED_EPACKAGE__TABLE_GENERATOR;
 
 	/**
+	 * The feature id for the '<em><b>Hb Generic Generators</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 0;
+
+	/**
 	 * The number of structural features of the '<em>Hb Annotated EPackage</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int HB_ANNOTATED_EPACKAGE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 0;
+	int HB_ANNOTATED_EPACKAGE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl <em>Hb Annotated EReference</em>}' class.
@@ -940,6 +1000,24 @@ public interface HbModelPackage extends EPackage {
 	int HB_ANNOTATED_EREFERENCE__COLUMN = PamodelPackage.PANNOTATED_EREFERENCE__COLUMN;
 
 	/**
+	 * The feature id for the '<em><b>Parsed Attribute Overrides</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_EREFERENCE__PARSED_ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_EREFERENCE__PARSED_ATTRIBUTE_OVERRIDES;
+
+	/**
+	 * The feature id for the '<em><b>Parsed Join Columns</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HB_ANNOTATED_EREFERENCE__PARSED_JOIN_COLUMNS = PamodelPackage.PANNOTATED_EREFERENCE__PARSED_JOIN_COLUMNS;
+
+	/**
 	 * The feature id for the '<em><b>Annotated EReference</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1212,6 +1290,17 @@ public interface HbModelPackage extends EPackage {
 	EClass getHbAnnotatedEPackage();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators <em>Hb Generic Generators</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Hb Generic Generators</em>'.
+	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators()
+	 * @see #getHbAnnotatedEPackage()
+	 * @generated
+	 */
+	EReference getHbAnnotatedEPackage_HbGenericGenerators();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference <em>Hb Annotated EReference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1242,7 +1331,7 @@ public interface HbModelPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	interface Literals {
+	interface Literals  {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEStructuralFeature <em>Hb Annotated EStructural Feature</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -1350,6 +1439,14 @@ public interface HbModelPackage extends EPackage {
 		EClass HB_ANNOTATED_EPACKAGE = eINSTANCE.getHbAnnotatedEPackage();
 
 		/**
+		 * The meta object literal for the '<em><b>Hb Generic Generators</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS = eINSTANCE.getHbAnnotatedEPackage_HbGenericGenerators();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl <em>Hb Annotated EReference</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1361,4 +1458,9 @@ public interface HbModelPackage extends EPackage {
 
 	}
 
+	/**
+	 * {@see PamodelPackage#pAnnotationReference(EClass, EClass)}
+	 */
+	public EReference pAnnotationReference(EClass paElementEClass, EClass pAnnotationEClass);
+
 } //HbModelPackage
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
index 780365cf3..395cf28c9 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
@@ -2,20 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEAttributeImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbAnnotatedEAttributeImpl.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEAttributeImpl;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
 import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Columns;
@@ -23,7 +19,6 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
 import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
-
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEStructuralFeature;
@@ -50,6 +45,13 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
  */
 public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implements HbAnnotatedEAttribute {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java
index 5313721b2..5696b5be3 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java
@@ -2,14 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEClassImpl.java,v 1.1 2006/08/24 22:12:51 mtaal Exp $
+ * $Id: HbAnnotatedEClassImpl.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEClassImpl;
-
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
 
@@ -28,6 +26,13 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	protected HbAnnotatedEClassImpl() {
 		super();
 	}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java
index 20a7c4009..a9fbf34dc 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java
@@ -2,14 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEPackageImpl.java,v 1.1 2006/08/24 22:12:51 mtaal Exp $
+ * $Id: HbAnnotatedEPackageImpl.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
 
-import org.eclipse.emf.ecore.EClass;
+import java.util.Collection;
 
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEPackageImpl;
-
+import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
 
@@ -18,6 +24,10 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
  * An implementation of the model object '<em><b>Hb Annotated EPackage</b></em>'.
  * <!-- end-user-doc -->
  * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbGenericGenerators <em>Hb Generic Generators</em>}</li>
+ * </ul>
  * </p>
  *
  * @generated
@@ -28,6 +38,23 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * The cached value of the '{@link #getHbGenericGenerators() <em>Hb Generic Generators</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHbGenericGenerators()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList hbGenericGenerators = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	protected HbAnnotatedEPackageImpl() {
 		super();
 	}
@@ -41,4 +68,84 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 		return HbModelPackage.Literals.HB_ANNOTATED_EPACKAGE;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getHbGenericGenerators() {
+		if (hbGenericGenerators == null) {
+			hbGenericGenerators = new EObjectContainmentEList(GenericGenerator.class, this, HbModelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS);
+		}
+		return hbGenericGenerators;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case HbModelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+				return ((InternalEList)getHbGenericGenerators()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case HbModelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+				return getHbGenericGenerators();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case HbModelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+				getHbGenericGenerators().clear();
+				getHbGenericGenerators().addAll((Collection)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case HbModelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+				getHbGenericGenerators().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case HbModelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+				return hbGenericGenerators != null && !hbGenericGenerators.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
 } //HbAnnotatedEPackageImpl
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
index 2299ac02e..c77aa5cfe 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
@@ -2,27 +2,22 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbAnnotatedEReferenceImpl.java,v 1.1 2006/08/24 22:12:51 mtaal Exp $
+ * $Id: HbAnnotatedEReferenceImpl.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.teneo.annotations.pamodel.impl.PAnnotatedEReferenceImpl;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
 import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Columns;
 import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
 import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
-
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEStructuralFeature;
@@ -48,6 +43,13 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
  */
 public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implements HbAnnotatedEReference {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java
index d9abf081f..30cc0ea8b 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java
@@ -2,20 +2,24 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbModelFactoryImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbModelFactoryImpl.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.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.hibernate.hbmodel.*;
 
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelFactory;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbModelPackage;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
@@ -24,6 +28,13 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.*;
  */
 public class HbModelFactoryImpl extends EFactoryImpl implements HbModelFactory {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java
index 2195a0955..88e453e00 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java
@@ -2,24 +2,20 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbModelPackageImpl.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbModelPackageImpl.java,v 1.2 2006/08/31 22:47:18 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
 
+import java.util.Iterator;
+
 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.annotations.pamodel.PamodelPackage;
-
 import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
-
 import org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationPackageImpl;
-
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement;
@@ -41,6 +37,13 @@ public class HbModelPackageImpl extends EPackageImpl implements HbModelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass hbAnnotatedEStructuralFeatureEClass = null;
 
 	/**
@@ -268,6 +271,15 @@ public class HbModelPackageImpl extends EPackageImpl implements HbModelPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getHbAnnotatedEPackage_HbGenericGenerators() {
+		return (EReference)hbAnnotatedEPackageEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getHbAnnotatedEReference() {
 		return hbAnnotatedEReferenceEClass;
 	}
@@ -316,6 +328,7 @@ public class HbModelPackageImpl extends EPackageImpl implements HbModelPackage {
 		hbAnnotatedEModelElementEClass = createEClass(HB_ANNOTATED_EMODEL_ELEMENT);
 
 		hbAnnotatedEPackageEClass = createEClass(HB_ANNOTATED_EPACKAGE);
+		createEReference(hbAnnotatedEPackageEClass, HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS);
 
 		hbAnnotatedEReferenceEClass = createEClass(HB_ANNOTATED_EREFERENCE);
 	}
@@ -374,6 +387,7 @@ public class HbModelPackageImpl extends EPackageImpl implements HbModelPackage {
 		initEClass(hbAnnotatedEModelElementEClass, HbAnnotatedEModelElement.class, "HbAnnotatedEModelElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(hbAnnotatedEPackageEClass, HbAnnotatedEPackage.class, "HbAnnotatedEPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedEPackage_HbGenericGenerators(), theHbAnnotationPackage.getGenericGenerator(), null, "hbGenericGenerators", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(hbAnnotatedEReferenceEClass, HbAnnotatedEReference.class, "HbAnnotatedEReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -381,4 +395,17 @@ public class HbModelPackageImpl extends EPackageImpl implements HbModelPackage {
 		createResource(eNS_URI);
 	}
 
+	/**
+	 * {@see PamodelPackage#pAnnotationReference(EClass, EClass)}
+	 */
+	public EReference pAnnotationReference(EClass paElementEClass, EClass pAnnotationEClass) {
+		if (PamodelPackage.eINSTANCE.getPAnnotatedEModelElement().isSuperTypeOf(paElementEClass) &&
+			PannotationPackage.eINSTANCE.getPAnnotation().isSuperTypeOf(pAnnotationEClass))
+			for (Iterator i = paElementEClass.getEAllReferences().iterator(); i.hasNext(); ) {
+				EReference r = (EReference) i.next();
+				if (r.getEReferenceType() == pAnnotationEClass)
+					return r;
+			}
+		return null;
+	}
 } //HbModelPackageImpl
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java
index 282b20d2e..0f1bc1082 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbModelAdapterFactory.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbModelAdapterFactory.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.util;
 
@@ -32,6 +32,13 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.*;
  */
 public class HbModelAdapterFactory extends AdapterFactoryImpl {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java
index 3c35c8417..03dc166a8 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: HbModelSwitch.java,v 1.1 2006/08/24 22:12:52 mtaal Exp $
+ * $Id: HbModelSwitch.java,v 1.2 2006/08/31 22:47:19 mtaal Exp $
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.util;
 
@@ -35,6 +35,13 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.*;
  */
 public class HbModelSwitch {
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "Copyright (c) 2005, 2006 Springsite BV (The Netherlands) and others.\nAll rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public\nLicense v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n\nContributors:\n   Martin Taal\n   Douglas Bitting\n";
+
+	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
index 473699813..73d5f9f15 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
@@ -12,7 +12,7 @@
  *   Davide Marchignoli
  * </copyright>
  *
- * $Id: IdMapper.java,v 1.4 2006/08/03 09:58:19 mtaal Exp $
+ * $Id: IdMapper.java,v 1.5 2006/08/31 22:47:19 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapper;
@@ -28,12 +28,16 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
 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.pannotation.Column;
 import org.eclipse.emf.teneo.annotations.pannotation.GeneratedValue;
 import org.eclipse.emf.teneo.annotations.pannotation.GenerationType;
 import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
 import org.eclipse.emf.teneo.annotations.processing.IdProcessor;
 import org.eclipse.emf.teneo.annotations.processing.ProcessingException;
+import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
+import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage;
 import org.eclipse.emf.teneo.simpledom.DocumentHelper;
 import org.eclipse.emf.teneo.simpledom.Element;
 
@@ -218,18 +222,53 @@ class IdMapper extends AbstractPropertyMapper implements IdProcessor {
 			}
 
 			final Element generatorElement = usedIdElement.addElement("generator");
-			generatorElement.addAttribute("class", IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 			if (GenerationType.TABLE_LITERAL.equals(generatedValue.getStrategy())) {
+				generatorElement.addAttribute("class", IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 				generatorElement.addElement("param").addAttribute("name", "table").setText("uid_table"); // externalize
 				// this
 				generatorElement.addElement("param").addAttribute("name", "column").setText("next_hi_value_column"); // externalize
 				// this
+			} else if (generatedValue.getGenerator() != null) {
+				final GenericGenerator gg = getGenericGenerator(id.getPaModel(), generatedValue.getGenerator());
+				if (gg != null) {
+					log.debug("GenericGenerator the strategy in the GeneratedValue is ignored (if even set)");
+					generatorElement.addAttribute("class", gg.getStrategy());
+					if (gg.getParameters() != null) {
+						for (Iterator params = gg.getParameters().iterator(); params.hasNext();) {
+							final Parameter param = (Parameter)params.next();
+							generatorElement.addElement("param").addAttribute("name", param.getName()).addText(param.getValue());
+						}
+					}
+				} else {
+					generatorElement.addAttribute("class", IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
+					final SequenceGenerator sg = id.getPaModel().getSequenceGenerator(id.getAnnotatedEAttribute(),
+							generatedValue.getGenerator());
+					generatorElement.addElement("param").addAttribute("name", "sequence").setText(sg.getSequenceName());
+				}
+			} else {
+				generatorElement.addAttribute("class", IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 			}
-			if (generatedValue.getGenerator() != null) {
-				final SequenceGenerator sg = id.getPaModel().getSequenceGenerator(id.getAnnotatedEAttribute(),
-						generatedValue.getGenerator());
-				generatorElement.addElement("param").addAttribute("name", "sequence").setText(sg.getSequenceName());
+		}
+	}
+	
+
+	/** Returns a sequence generator on the basis of its name, if not found then an exception is thrown.
+	 * efeature is passed for debugging purposes. */
+	public GenericGenerator getGenericGenerator(PAnnotatedModel paModel, String name) {
+		for (Iterator it = paModel.getPaEPackages().iterator(); it.hasNext();) {
+			final HbAnnotatedEPackage pae = (HbAnnotatedEPackage)it.next();
+			for (Iterator sit = pae.getHbGenericGenerators().iterator(); sit.hasNext();) {
+				final GenericGenerator gg = (GenericGenerator)sit.next();
+				if (gg.getName() != null && gg.getName().compareTo(name) == 0) {
+					if (gg.getStrategy() == null) {
+						throw new ProcessingException("The GenericGenerator: " + name + " has no strategy defined!");
+					}
+					
+					return gg;
+				}
 			}
 		}
+		log.debug("No GenericGenerator defined under name: " + name);
+		return null;
 	}
 }
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/log4j.properties b/tests/org.eclipse.emf.teneo.commontest/src/log4j.properties
index fb04c08b5..1cb8995d2 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/log4j.properties
+++ b/tests/org.eclipse.emf.teneo.commontest/src/log4j.properties
@@ -1,5 +1,5 @@
 # Set root logger level to error and its only appender to A1.
-log4j.rootCategory=debug, A1
+log4j.rootCategory=error, A1
 
 # A1 is set to be a ConsoleAppender.
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml
new file mode 100644
index 000000000..3fea9eddc
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml
@@ -0,0 +1,31 @@
+<?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">
+
+<!--	Generated by Elver Store tools on Fri Sep 01 00:37:07 CEST 2006 -->
+<hibernate-mapping>
+	<class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
+		<id name="myid" type="long" column="`myid`">
+			<generator class="identity"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
+	</class>
+	<class entity-name="SimpleID" abstract="false" lazy="false" discriminator-value="SimpleID" table="`simpleid`">
+		<id name="autoID" type="long">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
+	</class>
+	<class entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`">
+		<id name="myid" type="long" column="`myid`">
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml
new file mode 100644
index 000000000..3170f6867
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml
@@ -0,0 +1,28 @@
+<?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">
+
+<!--	Generated by Elver Store tools on Fri Sep 01 00:37:05 CEST 2006 -->
+<hibernate-mapping>
+	<class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
+		<id name="myid" type="long" column="`myid`">
+			<generator class="identity"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
+	</class>
+	<class entity-name="SimpleID" abstract="false" lazy="false" table="`simpleid`">
+		<id name="autoID" type="long">
+			<column not-null="true" unique="false" name="`autod`"/>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
+	</class>
+	<class entity-name="TableID" abstract="false" lazy="false" table="`tableid`">
+		<id name="myid" type="long" column="`myid`">
+			<generator class="hilo">
+				<param name="table">hilo_table</param>
+				<param name="column">the_hilo_column</param>
+			</generator>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml
index 8c89bbb73..8af3eae74 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:30 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:42 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" discriminator-value="Person" table="`person`">
 		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml
index 80d87721f..afcbe5254 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:12 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:24 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" table="`person`">
 		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml
index c90c84426..757a88293 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:36 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:47 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml
index 33a57f9a3..0d79dc08d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:19 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:32 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml
index cee8a3b69..e4585f249 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:50 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:01 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml
index 042d740a1..dfd4ede9f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:47 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:56 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml
index 57f486df9..660ddb664 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:50 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:00 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="TestA" abstract="false" lazy="false" discriminator-value="TestA" table="`testa`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml
index dedc9d41b..6b7fff9e6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:46 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:55 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="TestA" abstract="false" lazy="false" table="`testa`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml
index 38a8a1e5c..6161a16b4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:45 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:06 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Account" abstract="true" lazy="false" discriminator-value="Account" table="`account`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml
index 5d7b04335..cfb4b2943 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:12 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:34 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Account" abstract="true" lazy="false" table="`account`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml
index 2360bfe85..7d0bc83c2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:40 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:01 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="CapacityEntry" abstract="false" lazy="false" discriminator-value="CapacityEntry" table="`capacityentry`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml
index c22dee3ab..699145f18 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:08 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:30 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml
index 66bbe9728..d434369e4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:52 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:14 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml
index 572011e7e..636664e15 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:20 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:42 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml
index 45b082f96..0bdd88d1d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:41 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:03 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml
index c1cc5a673..05ff1ae8b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:09 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:31 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml
index 063f87596..42f6f3de5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:15:01 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:23 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml
index dc91eda53..176c477ab 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:30 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:50 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml
index eb1556078..2e209e310 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:50 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:12 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml
index 7f7d6ecca..037463169 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:18 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:40 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml
index 40b97f198..f6dca03bf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:54 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:19 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml
index 9f04bff5d..45d161a33 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:24 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:46 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml
index 3f34f1ca7..1feb14909 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:51 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:13 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml
index 30f5ee400..17c011d93 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:19 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:40 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml
index 670841a36..fc2b452c3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:46 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:42 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
 		<id name="id" type="java.lang.String" column="`id`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml
index c27754ebc..9b8efc71d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:32 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:34 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" table="`a`">
 		<id name="id" type="java.lang.String" column="`id`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml
index cdeb3c29e..0ced93d4b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:35 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:46 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<id type="long" name="myid" column="myid">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml
index 95d84ee71..17610b5b0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:18 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:30 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<id type="long" name="myid" column="myid">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml
index 8d1813e12..949e52176 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:44 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml
index e676b015a..b23251ed4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:29 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:40 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml
index 314c56964..9a62a76c5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:39 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:50 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml
index 2cb71b77b..8a151f1a5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:23 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:36 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Basic" abstract="false" lazy="false" table="`basic`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml
index ad8d3640d..8f205a2c4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:33 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:45 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml
index 5c4218835..7482b3e0e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:16 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:29 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml
index c65e8555c..70fe8a7d2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:39 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:50 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml
index d44f8ac40..18e0f52c2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:23 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:36 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml
index ada397c4d..ec1ac7843 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:40 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:51 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" discriminator-value="Person" table="`person`">
 		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml
index dc38abecf..7d08c1935 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:24 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:37 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" table="`person`">
 		<composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml
index 0f7f98e48..0aafd4924 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:44 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml
index c789dc33b..bd257b5d9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:28 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:40 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml
index 592bcb72f..bb681c9eb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:41 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:52 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml
index 15f755aee..db80f932d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:26 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:38 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Embedder" abstract="false" lazy="false" table="`embedder`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml
index c67691494..6ba5e1839 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:45 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:55 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" discriminator-value="Person" table="`person`">
 		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml
index 2d46d3584..def7a94a9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:29 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:41 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" table="`person`">
 		<composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml
index f39b23822..46208d140 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:34 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:41 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`">
 		<id name="myid" type="long" column="`myid`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml
index 35ad36e16..0b22ad003 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:17 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:21 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`">
 		<id name="myid" type="long" column="`myid`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml
index b4dacecd1..69e55840c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:35 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:47 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml
index 88417f651..1b5c1202c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:18 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:31 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="User" abstract="false" lazy="false" table="`user`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml
index 44bcd564e..14832b806 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:32 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:44 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml
index 95f71e92d..9ac9e2f11 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:15 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:28 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml
index d8e62580f..6340ae9c1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:30 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:42 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml
index 05939f7dc..7f161b7f3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:09 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:23 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml
index 406f3533c..b9a310de8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:45 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<id name="id" type="long" column="`id`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml
index c3e80055a..a6d7de91a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:29 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:41 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<id name="id" type="long" column="`id`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml
index c111dadb8..6392ff095 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:36 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:47 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml
index 9bc92d7a2..81bbfea0f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:19 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:32 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Cntr" abstract="false" lazy="false" table="`cntr`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml
index e53200e44..371556bc4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:34 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:45 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="SpecificDocument" abstract="false" lazy="false" discriminator-value="SpecificDocument" table="`specificdocument`">
 		<id name="myId" type="long" column="`myid`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml
index 6b630a552..bbfa498a5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:17 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:29 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`">
 		<id name="myId" type="long" column="`myid`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml
index 51f714e6b..5ec64cd67 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:41 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:51 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
 		<id name="theID" type="long" column="`theid`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml
index 9c2bd72d5..2d6b77776 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:25 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:37 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" table="`body`">
 		<id name="theID" type="long" column="`theid`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml
index 3afade9f4..566fb9202 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:32 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:43 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`">
 		<id name="id" type="long" column="`ID`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml
index 47c74a346..48c3d6c23 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:14 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:27 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`PERSON`">
 		<id name="id" type="long" column="`ID`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml
index 5f51dcfa4..c76da443a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:38 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:49 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml
index 6bd044983..57408cb49 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:21 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:34 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml
index 30b795a07..40ee07904 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:43 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:53 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml
index 087ad36b5..3ce4714cb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:27 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:39 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="MyItem" abstract="false" lazy="false" table="`myitem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml
index 761b23a0e..866c14df8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:42 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:52 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml
index 84cf01b43..6c81bd839 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:26 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:38 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml
index 3e6d9cf2d..39a4392f8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:31 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:43 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml
index a0f4d6e14..253f69bf8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:13 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:26 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml
index b745a9ae5..b22507564 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:39 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:49 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`">
 		<id name="theID" type="long" column="`theid`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml
index 4d12f8b38..e4d34be44 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:22 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:35 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Body" abstract="false" lazy="false" table="`body`">
 		<id name="theID" type="long" column="`theid`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml
index 1e78c9f79..57cb9b7a3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:40 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:50 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml
index 8ae5ab140..9d7fb98ef 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:24 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:37 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`myitemtable`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml
index 050ad9f43..22c308865 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:48 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:59 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml
index 8cc5a9c4c..f708c2d0f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:45 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:30:55 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml
index eb33b17de..ec121ec38 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:53 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:05 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="PriceByQuantityType" abstract="false" lazy="false" discriminator-value="PriceByQuantityType" table="`pricebyquantitytype`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml
index b536acd0c..3c5b1063c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:51 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:01 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml
index 3612edf16..bf5571ff2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:15:07 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:18 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedChildNR" abstract="false" lazy="false" discriminator-value="ContainedChildNR" table="`containedchildnr`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml
index a21f53222..42985c2a2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:14:57 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:09 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml
index 198494591..6bc58f715 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:15:11 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:22 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml
index f5c584b18..f2b775098 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:15:00 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:13 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" table="`main`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml
index 62c0d1e93..341f8232b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:15:13 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:26 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml
index c35623f93..f1acb0995 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:15:04 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:15 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Main" abstract="false" lazy="false" table="`main`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml
index cf73b30b3..fad5308f1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:55 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:20 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml
index 463253eed..e6370442c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:24 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:46 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml
index 421e71e36..152a31adb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:44 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:05 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml
index a872fd8a6..4cbf59191 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:11 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:33 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml
index 7553f1a34..11e491e6e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:15:04 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:26 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Forum" abstract="false" lazy="false" discriminator-value="Forum" table="`forum`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml
index d89200949..ef4abcbc6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:37 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:58 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Forum" abstract="false" lazy="false" table="`forum`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml
index 134aa997e..3c4c93f63 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:53 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:16 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="PType" abstract="false" lazy="false" discriminator-value="PType" table="`ptype`">
 		<id name="id" type="long" column="`id`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml
index 9fbe47308..5ac62d7d9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:21 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:43 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="PType" abstract="false" lazy="false" table="`ptype`">
 		<id name="id" type="long" column="`id`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml
index 5424897b0..30e3a8e9f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:39 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:00 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml
index d21216f99..2c89c2869 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:07 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:29 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml
index b65833a38..141fa9cb9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:53 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:18 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="myID" column="myID">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml
index eb989384a..9d550c41a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:22 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:44 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="myID" column="myID">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml
index 916febb64..e7ee8174f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:57 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:21 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml
index efab4396d..a650d12dc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:26 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:49 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml
index cdd4f7ba5..55b285894 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:43 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:04 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml
index 66d534c7d..04fb644b9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:10 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:32 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml
index ebed27733..5da8c92bf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:56 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:21 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="library.Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml
index f61babb43..676d80ed9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:26 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:48 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="library.Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml
index 670a49dea..8598936ae 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:57 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:22 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml
index ff76766e2..7dbb1fc90 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:27 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:49 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml
index d255a5fd1..e7efae15a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:54 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:19 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml
index da30080b2..a6ea32041 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:23 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:45 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml
index 4d2b87adc..dac6b81b9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:38 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:59 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml
index 0b266ae67..48f2684d8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:04 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:28 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml
index 94dec7c27..ebf511f38 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:15:02 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:24 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml
index 0ce2b8259..9da154a36 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:32 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:52 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml
index 07717f382..7f39631cf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:15:03 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:25 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`">
 		<id name="id" type="java.lang.String" column="`id`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml
index 60d733bb0..ccf7171ce 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:33 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:53 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`">
 		<id name="id" type="java.lang.String" column="`id`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml
index 12b971ce0..6d2803718 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:49 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:10 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="AuthorsType" abstract="false" lazy="false" discriminator-value="AuthorsType" table="`authorstype`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml
index 842ac06c7..61c08af58 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:16 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:38 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="AuthorsType" abstract="false" lazy="false" table="`authorstype`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml
index 3928f44b1..fbcec8ff2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:15:03 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:25 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="WorkflowElement" abstract="true" lazy="false" discriminator-value="WorkflowElement" table="`workflowelement`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml
index 9c66122e8..ac38cbdc0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Sat Aug 26 01:14:33 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:31:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml
index 16de7b1aa..2cfff48b8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:43 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:40 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml
index 5656840bc..82fa98525 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:29 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:31 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Element" abstract="false" lazy="false" table="`element`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml
index 5545b1bd9..e5ac6fdda 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:47 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:43 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml
index d172a7a1c..e932a9164 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:33 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:34 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
index 92b05c242..c0119ce48 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:48 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:44 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
index 6594ad07b..bad40eff3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:34 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:35 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml
index 2b8693a9b..8548d9e13 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:43 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:40 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="statesByCountry" abstract="false" lazy="false" discriminator-value="statesByCountry" table="`statesbycountry`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml
index 0c44a961e..c1a511830 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:28 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:30 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml
index 97867f95e..28d6b2080 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:44 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:41 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml
index db37e1669..51b34b536 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:30 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:32 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml
index e71a2dfb0..a542f9469 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:49 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:45 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml
index a7d88cccf..95fd6876d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:36 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:36 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="A" abstract="false" lazy="false" table="`a`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml
index a2ba8efd4..da51fc877 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:46 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:42 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml
index 7082c1797..9382e5fd9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:32 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:33 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml
index 18002215b..47815b5d0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:40 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:39 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="SimpleList" abstract="false" lazy="false" discriminator-value="SimpleList" table="`simplelist`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml
index b45469223..e025b5533 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:26 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:27 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml
index 05dc7c430..6e68ace1b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:45 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:42 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml
index e91a0df8b..fde797699 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:31 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:33 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml
index edf0a04cb..4a55bd1ba 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:51 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:46 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml
index fba7f27c5..9633b067e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:39 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:38 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml
index 302aee02d..43834e096 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:51 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:46 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml
index 84bdcb1b4..b306c43aa 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:37 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:37 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml
index 630267602..2598c88e8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:04 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:55 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml
index 71612bc98..44eb06d82 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:56 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:49 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml
index d1489340c..e63f21613 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:03 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml
index f5dd720ed..98efccd1c 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:55 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:48 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml
index d10252f26..4b51fce05 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:04 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:55 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`">
 		<id name="itemType" column="`itemtype`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml
index 6c2b7c19e..a67ae752a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:56 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:49 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Item" abstract="false" lazy="false" table="`item`">
 		<id name="itemType" column="`itemtype`">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml
index b82d985c2..9a1d8672a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:02 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Thing" abstract="false" lazy="false" discriminator-value="Thing" table="`thing`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml
index 280436b82..40c357c6d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:53 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:47 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Thing" abstract="false" lazy="false" table="`thing`">
 		<id name="name" type="java.lang.String" column="`name`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml
index 2e294cf37..aa267848e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:05 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:55 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml
index 0975e8df1..4e9707bdf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:58 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:50 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="true" lazy="false" table="`address`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml
index e6308e9a4..26ed43bb4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:02 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:54 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
 		<id name="hair" type="java.lang.String" column="`hair`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml
index e35b4b465..82e8ebfa2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:55 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:48 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Head" abstract="false" lazy="false" table="`head`">
 		<id name="hair" type="java.lang.String" column="`hair`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml
index d80520768..427afa3ab 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:05 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:56 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Me" abstract="false" lazy="false" discriminator-value="Me" table="`me`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml
index 76be70fb3..03c21aeda 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:58 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:50 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="Me" abstract="false" lazy="false" table="`me`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml
index b170765b0..654fc3b49 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:17:06 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:56 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="AbstractSuper" abstract="false" lazy="false" discriminator-value="AbstractSuper" table="`abstractsuper`">
 		<id type="long" name="e_id" column="e_id">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml
index 8e44f763f..15b8fcc6e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?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">
 
-<!--	Generated by Elver Store tools on Thu Aug 24 21:16:59 CEST 2006 -->
+<!--	Generated by Elver Store tools on Fri Sep 01 00:32:51 CEST 2006 -->
 <hibernate-mapping>
 	<class entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`">
 		<id type="long" name="e_id" column="e_id">
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 70449fa47..562ad45c2 100644
--- 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
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllTests.java,v 1.4 2006/08/21 11:29:45 mtaal Exp $
+ * $Id: AllTests.java,v 1.5 2006/08/31 22:46:12 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.test.emf.annotations;
@@ -50,7 +50,7 @@ import org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  */
 public class AllTests {
 
@@ -58,6 +58,9 @@ public class AllTests {
 		TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.annotations",
 				HibernateTestbed.instance().getConfigurations());
 
+		suite.addTestSuite(HbIdAction.class);
+/*
+		suite.addTestSuite(IdAction.class);
 		suite.addTestSuite(LazyLibraryAction.class);
 
 		suite.addTestSuite(JoinColumnsTest.class);
@@ -67,7 +70,6 @@ public class AllTests {
 		suite.addTestSuite(InheritanceAnnotationAction.class);
 		suite.addTestSuite(BookAction.class);
 
-		suite.addTestSuite(IdAction.class);
 		suite.addTestSuite(MappedSuperClassAction.class);
 		suite.addTestSuite(AssociationOverrideAction.class);		
 		suite.addTestSuite(IdBagAction.class);
@@ -93,8 +95,7 @@ public class AllTests {
 		suite.addTestSuite(AttributeOverridesAction.class);
 		suite.addTestSuite(LobAction.class);
 		suite.addTestSuite(EmbeddedIdAction.class);
-
-		return suite;
+*/		return suite;
 
 	}
 
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/HbIdAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/HbIdAction.java
new file mode 100644
index 000000000..10caa58a6
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/HbIdAction.java
@@ -0,0 +1,94 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2005, 2006 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: HbIdAction.java,v 1.1 2006/08/31 22:46:12 mtaal Exp $
+ */
+
+package org.eclipse.emf.teneo.hibernate.test.emf.annotations;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdFactory;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.IdentityID;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.SimpleID;
+import org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.TableID;
+import org.eclipse.emf.teneo.test.AbstractTestAction;
+import org.eclipse.emf.teneo.test.stores.TestStore;
+
+/**
+ * Tests GenericGenerator of hibernate
+ * 
+ * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
+ * @version $Revision: 1.1 $
+ */
+public class HbIdAction extends AbstractTestAction {
+	/** How many test objects are created */
+	private static final int NO_TEST_OBJECTS = 10;
+
+	/**
+	 * Constructor for ClassHierarchyParsing.
+	 * 
+	 * @param arg0
+	 */
+	public HbIdAction() {
+		super(IdPackage.eINSTANCE);
+	}
+
+	/** Creates an item, an address and links them to a po. */
+	public void doAction(TestStore store) {
+		//store.disableDrop();
+		final IdFactory factory = IdFactory.eINSTANCE;
+		{
+			store.beginTransaction();
+			for (int i = 0; i < NO_TEST_OBJECTS; i++) {
+				store.store(factory.createIdentityID());
+				store.store(factory.createTableID());
+				store.store(factory.createSimpleID());
+			}
+			store.commitTransaction();
+		}
+
+		// read back and check it
+		{
+			store.beginTransaction();
+			// test if we saved them all
+			List list = (List) store.getObjects(IdentityID.class);
+			HashMap testMap = new HashMap();
+			for (Iterator it = list.iterator(); it.hasNext();) {
+				IdentityID iid = (IdentityID) it.next();
+				testMap.put(new Long(iid.getMyid()), iid);
+			}
+			assertEquals(NO_TEST_OBJECTS, testMap.size());
+
+			list = (List) store.getObjects(TableID.class);
+			testMap = new HashMap();
+			for (Iterator it = list.iterator(); it.hasNext();) {
+				TableID sid = (TableID) it.next();
+				testMap.put(new Long(sid.getMyid()), sid);
+			}
+			assertEquals(NO_TEST_OBJECTS, testMap.size());
+
+			list = (List) store.getObjects(SimpleID.class);
+			testMap = new HashMap();
+			for (Iterator it = list.iterator(); it.hasNext();) {
+				SimpleID sid = (SimpleID) it.next();
+				testMap.put(new Long(sid.getAutoID()), sid);
+			}
+			assertEquals(NO_TEST_OBJECTS, testMap.size());
+			store.commitTransaction();
+		}
+	}
+}
\ No newline at end of file