[416435] [Releng] Require a reason for @CleanRepositories

https://bugs.eclipse.org/bugs/show_bug.cgi?id=416435

45 files changed, 6930 insertions, 6419 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
index cbbec40141..71e0f44a03 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
@@ -261,13 +261,11 @@ public class AllTestsHibernate extends AllConfigs
   {
 
     @Override
-    @CleanRepositoriesBefore
     public void testCommitNestedPackages() throws Exception
     {
     }
 
     @Override
-    @CleanRepositoriesBefore
     public void testCommitTopLevelPackages() throws Exception
     {
     }
@@ -333,7 +331,6 @@ public class AllTestsHibernate extends AllConfigs
   {
 
     @Override
-    @CleanRepositoriesBefore
     public void test_missingDependency() throws Exception
     {
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_333473_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_333473_Test.java
index d06fee9160..078c034ce6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_333473_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_333473_Test.java
@@ -24,13 +24,11 @@ import java.util.Collections;
  */
 public class HibernateBugzilla_333473_Test extends AbstractCDOTest
 {
-  @CleanRepositoriesBefore
   public void testRemovalFirstAttempt() throws Exception
   {
     testRemoval(false);
   }
 
-  @CleanRepositoriesBefore
   public void testRemovalSecondAttempt() throws Exception
   {
     testRemoval(true);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_380987_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_380987_Test.java
index 44c480bf13..c580fc3274 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_380987_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_380987_Test.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.server.CDOServerImporter;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place;
@@ -40,7 +39,6 @@ import java.util.List;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 public class HibernateBugzilla_380987_Test extends AbstractCDOTest
 {
   // in hsqldb several eclasses do not work, they work fine in mysql
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_381013_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_381013_Test.java
index 720d1c25c7..640ffc6a2b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_381013_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_381013_Test.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.server.CDOServerExporter;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import java.io.ByteArrayOutputStream;
@@ -23,7 +22,6 @@ import java.io.ByteArrayOutputStream;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 public class HibernateBugzilla_381013_Test extends AbstractCDOTest
 {
   public void testExport() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_392653_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_392653_Test.java
index d0ab79df56..aa83bf7920 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_392653_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_392653_Test.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.server.CDOServerImporter;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CommitException;
@@ -29,7 +28,6 @@ import java.io.ByteArrayOutputStream;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 public class HibernateBugzilla_392653_Test extends AbstractCDOTest
 {
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_395684_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_395684_Test.java
index 87eb9178c6..bc51de84a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_395684_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_395684_Test.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -31,7 +30,6 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 @Requires(IRepositoryConfig.CAPABILITY_AUDITING)
 public class HibernateBugzilla_395684_Test extends AbstractCDOTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java
index 89cce04094..6994761f27 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java
@@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
@@ -24,7 +23,6 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 @Requires(IRepositoryConfig.CAPABILITY_AUDITING)
 public class HibernateBugzilla_397682_Test extends AbstractCDOTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java
index 77887ac25b..d29ee5a9aa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java
@@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1;
@@ -25,7 +24,6 @@ import org.eclipse.emf.cdo.util.CommitException;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 @Requires(IRepositoryConfig.CAPABILITY_AUDITING)
 public class HibernateBugzilla_398057_Test extends AbstractCDOTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
index 780394368b..cf867c4c39 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
@@ -23,7 +23,6 @@ public class HibernateExternalReferenceTest extends ExternalReferenceTest
 {
 
   @Override
-  @CleanRepositoriesBefore
   public void testXRefExternalObject() throws Exception
   {
     // xreffing an external object is not possible as the
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Export_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Export_Test.java
index 4fb3689a96..00ac215467 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Export_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Export_Test.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.server.CDOServerExporter;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -25,7 +24,6 @@ import java.io.ByteArrayOutputStream;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 public class Hibernate_Export_Test extends AbstractCDOTest
 {
   public void testExport() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Failure_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Failure_Test.java
index 5862391f51..8d82451392 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Failure_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Failure_Test.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.server.CDOServerImporter;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CommitException;
 
@@ -29,7 +28,6 @@ import java.io.ByteArrayOutputStream;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 public class Hibernate_Failure_Test extends AbstractCDOTest
 {
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
index 21499a5b6b..af31df0937 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -29,7 +28,6 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
 /**
  * @author Martin Taal
  */
-@CleanRepositoriesBefore
 @Requires(IRepositoryConfig.CAPABILITY_AUDITING)
 public class Hibernate_Missing_Version_Test extends AbstractCDOTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Main.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Main.java
index 614d11078a..afce225128 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Main.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Main.java
@@ -31,109 +31,110 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz356181_Main extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transient</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transient</em>' attribute.
-	 * @see #setTransient(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_Transient()
-	 * @model annotation="teneo.jpa value='@Transient'"
-	 * @generated
-	 */
-	String getTransient();
+public interface Bz356181_Main extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Transient</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Transient</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Transient</em>' attribute.
+   * @see #setTransient(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_Transient()
+   * @model annotation="teneo.jpa value='@Transient'"
+   * @generated
+   */
+  String getTransient();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransient <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transient</em>' attribute.
-	 * @see #getTransient()
-	 * @generated
-	 */
-	void setTransient(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransient <em>Transient</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Transient</em>' attribute.
+   * @see #getTransient()
+   * @generated
+   */
+  void setTransient(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Non Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Transient</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Transient</em>' attribute.
-	 * @see #setNonTransient(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_NonTransient()
-	 * @model
-	 * @generated
-	 */
-	String getNonTransient();
+  /**
+   * Returns the value of the '<em><b>Non Transient</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Non Transient</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Non Transient</em>' attribute.
+   * @see #setNonTransient(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_NonTransient()
+   * @model
+   * @generated
+   */
+  String getNonTransient();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getNonTransient <em>Non Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Transient</em>' attribute.
-	 * @see #getNonTransient()
-	 * @generated
-	 */
-	void setNonTransient(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getNonTransient <em>Non Transient</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Non Transient</em>' attribute.
+   * @see #getNonTransient()
+   * @generated
+   */
+  void setNonTransient(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Transient Ref</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transient Ref</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transient Ref</em>' reference.
-	 * @see #setTransientRef(Bz356181_Transient)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_TransientRef()
-	 * @model transient="true"
-	 * @generated
-	 */
-	Bz356181_Transient getTransientRef();
+  /**
+   * Returns the value of the '<em><b>Transient Ref</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Transient Ref</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Transient Ref</em>' reference.
+   * @see #setTransientRef(Bz356181_Transient)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_TransientRef()
+   * @model transient="true"
+   * @generated
+   */
+  Bz356181_Transient getTransientRef();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientRef <em>Transient Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transient Ref</em>' reference.
-	 * @see #getTransientRef()
-	 * @generated
-	 */
-	void setTransientRef(Bz356181_Transient value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientRef <em>Transient Ref</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Transient Ref</em>' reference.
+   * @see #getTransientRef()
+   * @generated
+   */
+  void setTransientRef(Bz356181_Transient value);
 
-	/**
-	 * Returns the value of the '<em><b>Transient Other Ref</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transient Other Ref</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transient Other Ref</em>' reference.
-	 * @see #setTransientOtherRef(Bz356181_NonTransient)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_TransientOtherRef()
-	 * @model transient="true"
-	 * @generated
-	 */
-	Bz356181_NonTransient getTransientOtherRef();
+  /**
+   * Returns the value of the '<em><b>Transient Other Ref</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Transient Other Ref</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Transient Other Ref</em>' reference.
+   * @see #setTransientOtherRef(Bz356181_NonTransient)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_Main_TransientOtherRef()
+   * @model transient="true"
+   * @generated
+   */
+  Bz356181_NonTransient getTransientOtherRef();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientOtherRef <em>Transient Other Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transient Other Ref</em>' reference.
-	 * @see #getTransientOtherRef()
-	 * @generated
-	 */
-	void setTransientOtherRef(Bz356181_NonTransient value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientOtherRef <em>Transient Other Ref</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Transient Other Ref</em>' reference.
+   * @see #getTransientOtherRef()
+   * @generated
+   */
+  void setTransientOtherRef(Bz356181_NonTransient value);
 
 } // Bz356181_Main
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_NonTransient.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_NonTransient.java
index 51e224533c..1b5d0dd099 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_NonTransient.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_NonTransient.java
@@ -28,31 +28,32 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz356181_NonTransient extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Main</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Main</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Main</em>' reference.
-	 * @see #setMain(Bz356181_Main)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_NonTransient_Main()
-	 * @model
-	 * @generated
-	 */
-	Bz356181_Main getMain();
+public interface Bz356181_NonTransient extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Main</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Main</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Main</em>' reference.
+   * @see #setMain(Bz356181_Main)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz356181_NonTransient_Main()
+   * @model
+   * @generated
+   */
+  Bz356181_Main getMain();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient#getMain <em>Main</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Main</em>' reference.
-	 * @see #getMain()
-	 * @generated
-	 */
-	void setMain(Bz356181_Main value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient#getMain <em>Main</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Main</em>' reference.
+   * @see #getMain()
+   * @generated
+   */
+  void setMain(Bz356181_Main value);
 
 } // Bz356181_NonTransient
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Transient.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Transient.java
index fd2f8a718f..df10f75320 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Transient.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz356181_Transient.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model annotation="teneo.jpa value='@Transient'"
  * @generated
  */
-public interface Bz356181_Transient extends EObject {
+public interface Bz356181_Transient extends EObject
+{
 
 } // Bz356181_Transient
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Group.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Group.java
index fefee09e99..2988f869f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Group.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Group.java
@@ -29,23 +29,24 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz380987_Group extends EObject {
-	/**
-	 * Returns the value of the '<em><b>People</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>People</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>People</em>' reference list.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Group_People()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup
-	 * @model opposite="group"
-	 * @generated
-	 */
-	EList<Bz380987_Person> getPeople();
+public interface Bz380987_Group extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>People</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup <em>Group</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>People</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>People</em>' reference list.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Group_People()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup
+   * @model opposite="group"
+   * @generated
+   */
+  EList<Bz380987_Person> getPeople();
 
 } // Bz380987_Group
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Person.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Person.java
index 9d81daeb87..05a1c45696 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Person.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Person.java
@@ -31,67 +31,68 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz380987_Person extends EObject {
-	/**
-	 * 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.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Person_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
+public interface Bz380987_Person extends EObject
+{
+  /**
+   * 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.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Person_Name()
+   * @model
+   * @generated
+   */
+  String getName();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#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);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#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>Group</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople <em>People</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</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>Group</em>' reference list.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Person_Group()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople
-	 * @model opposite="people"
-	 * @generated
-	 */
-	EList<Bz380987_Group> getGroup();
+  /**
+   * Returns the value of the '<em><b>Group</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople <em>People</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Group</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>Group</em>' reference list.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Person_Group()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople
+   * @model opposite="people"
+   * @generated
+   */
+  EList<Bz380987_Group> getGroup();
 
-	/**
-	 * Returns the value of the '<em><b>Places</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople <em>People</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Places</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>Places</em>' reference list.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Person_Places()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople
-	 * @model opposite="people"
-	 * @generated
-	 */
-	EList<Bz380987_Place> getPlaces();
+  /**
+   * Returns the value of the '<em><b>Places</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople <em>People</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Places</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>Places</em>' reference list.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Person_Places()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople
+   * @model opposite="people"
+   * @generated
+   */
+  EList<Bz380987_Place> getPlaces();
 
 } // Bz380987_Person
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Place.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Place.java
index 6677acf523..512497ade1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Place.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz380987_Place.java
@@ -30,49 +30,50 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz380987_Place extends EObject {
-	/**
-	 * 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.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Place_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
+public interface Bz380987_Place extends EObject
+{
+  /**
+   * 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.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Place_Name()
+   * @model
+   * @generated
+   */
+  String getName();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#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);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#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>People</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces <em>Places</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>People</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>People</em>' reference list.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Place_People()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces
-	 * @model opposite="places"
-	 * @generated
-	 */
-	EList<Bz380987_Person> getPeople();
+  /**
+   * Returns the value of the '<em><b>People</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces <em>Places</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>People</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>People</em>' reference list.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz380987_Place_People()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces
+   * @model opposite="places"
+   * @generated
+   */
+  EList<Bz380987_Person> getPeople();
 
 } // Bz380987_Place
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Enum.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Enum.java
index 1ef8e64026..4aca2f24a3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Enum.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Enum.java
@@ -25,192 +25,204 @@ import java.util.List;
  * @model
  * @generated
  */
-public enum Bz387752_Enum implements Enumerator {
-	/**
-	 * The '<em><b>VAL0</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #VAL0_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	VAL0(0, "VAL0", "VAL0"),
-
-	/**
-	 * The '<em><b>VAL1</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #VAL1_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	VAL1(1, "VAL1", "VAL1");
-
-	/**
-	 * The '<em><b>VAL0</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>VAL0</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #VAL0
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int VAL0_VALUE = 0;
-
-	/**
-	 * The '<em><b>VAL1</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>VAL1</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #VAL1
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int VAL1_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Bz387752 Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Bz387752_Enum[] VALUES_ARRAY =
-		new Bz387752_Enum[] {
-			VAL0,
-			VAL1,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Bz387752 Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Bz387752_Enum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Bz387752 Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Bz387752_Enum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Bz387752_Enum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Bz387752 Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Bz387752_Enum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Bz387752_Enum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Bz387752 Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Bz387752_Enum get(int value) {
-		switch (value) {
-			case VAL0_VALUE: return VAL0;
-			case VAL1_VALUE: return VAL1;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Bz387752_Enum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //Bz387752_Enum
+public enum Bz387752_Enum implements Enumerator
+{
+  /**
+   * The '<em><b>VAL0</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #VAL0_VALUE
+   * @generated
+   * @ordered
+   */
+  VAL0(0, "VAL0", "VAL0"),
+
+  /**
+   * The '<em><b>VAL1</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #VAL1_VALUE
+   * @generated
+   * @ordered
+   */
+  VAL1(1, "VAL1", "VAL1");
+
+  /**
+   * The '<em><b>VAL0</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>VAL0</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #VAL0
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int VAL0_VALUE = 0;
+
+  /**
+   * The '<em><b>VAL1</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>VAL1</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #VAL1
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int VAL1_VALUE = 1;
+
+  /**
+   * An array of all the '<em><b>Bz387752 Enum</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final Bz387752_Enum[] VALUES_ARRAY = new Bz387752_Enum[] { VAL0, VAL1, };
+
+  /**
+   * A public read-only list of all the '<em><b>Bz387752 Enum</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<Bz387752_Enum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+  /**
+   * Returns the '<em><b>Bz387752 Enum</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static Bz387752_Enum get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      Bz387752_Enum result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>Bz387752 Enum</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static Bz387752_Enum getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      Bz387752_Enum result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>Bz387752 Enum</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static Bz387752_Enum get(int value)
+  {
+    switch (value)
+    {
+    case VAL0_VALUE:
+      return VAL0;
+    case VAL1_VALUE:
+      return VAL1;
+    }
+    return null;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private Bz387752_Enum(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public int getValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getLiteral()
+  {
+    return literal;
+  }
+
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+
+} // Bz387752_Enum
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Main.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Main.java
index f14343fb5a..a02c8f20c8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Main.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz387752_Main.java
@@ -31,172 +31,173 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz387752_Main extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Str Unsettable</b></em>' attribute.
-	 * The default value is <code>"def_value"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Str Unsettable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Str Unsettable</em>' attribute.
-	 * @see #isSetStrUnsettable()
-	 * @see #unsetStrUnsettable()
-	 * @see #setStrUnsettable(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_StrUnsettable()
-	 * @model default="def_value" unsettable="true"
-	 * @generated
-	 */
-	String getStrUnsettable();
+public interface Bz387752_Main extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Str Unsettable</b></em>' attribute.
+   * The default value is <code>"def_value"</code>.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Str Unsettable</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Str Unsettable</em>' attribute.
+   * @see #isSetStrUnsettable()
+   * @see #unsetStrUnsettable()
+   * @see #setStrUnsettable(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_StrUnsettable()
+   * @model default="def_value" unsettable="true"
+   * @generated
+   */
+  String getStrUnsettable();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Str Unsettable</em>' attribute.
-	 * @see #isSetStrUnsettable()
-	 * @see #unsetStrUnsettable()
-	 * @see #getStrUnsettable()
-	 * @generated
-	 */
-	void setStrUnsettable(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Str Unsettable</em>' attribute.
+   * @see #isSetStrUnsettable()
+   * @see #unsetStrUnsettable()
+   * @see #getStrUnsettable()
+   * @generated
+   */
+  void setStrUnsettable(String value);
 
-	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetStrUnsettable()
-	 * @see #getStrUnsettable()
-	 * @see #setStrUnsettable(String)
-	 * @generated
-	 */
-	void unsetStrUnsettable();
+  /**
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isSetStrUnsettable()
+   * @see #getStrUnsettable()
+   * @see #setStrUnsettable(String)
+   * @generated
+   */
+  void unsetStrUnsettable();
 
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Str Unsettable</em>' attribute is set.
-	 * @see #unsetStrUnsettable()
-	 * @see #getStrUnsettable()
-	 * @see #setStrUnsettable(String)
-	 * @generated
-	 */
-	boolean isSetStrUnsettable();
+  /**
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}' attribute is set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return whether the value of the '<em>Str Unsettable</em>' attribute is set.
+   * @see #unsetStrUnsettable()
+   * @see #getStrUnsettable()
+   * @see #setStrUnsettable(String)
+   * @generated
+   */
+  boolean isSetStrUnsettable();
 
-	/**
-	 * Returns the value of the '<em><b>Str Settable</b></em>' attribute.
-	 * The default value is <code>"value"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Str Settable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Str Settable</em>' attribute.
-	 * @see #setStrSettable(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_StrSettable()
-	 * @model default="value"
-	 * @generated
-	 */
-	String getStrSettable();
+  /**
+   * Returns the value of the '<em><b>Str Settable</b></em>' attribute.
+   * The default value is <code>"value"</code>.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Str Settable</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Str Settable</em>' attribute.
+   * @see #setStrSettable(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_StrSettable()
+   * @model default="value"
+   * @generated
+   */
+  String getStrSettable();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrSettable <em>Str Settable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Str Settable</em>' attribute.
-	 * @see #getStrSettable()
-	 * @generated
-	 */
-	void setStrSettable(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrSettable <em>Str Settable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Str Settable</em>' attribute.
+   * @see #getStrSettable()
+   * @generated
+   */
+  void setStrSettable(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Enum Settable</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enum Settable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enum Settable</em>' attribute.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-	 * @see #setEnumSettable(Bz387752_Enum)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_EnumSettable()
-	 * @model
-	 * @generated
-	 */
-	Bz387752_Enum getEnumSettable();
+  /**
+   * Returns the value of the '<em><b>Enum Settable</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Enum Settable</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Enum Settable</em>' attribute.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+   * @see #setEnumSettable(Bz387752_Enum)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_EnumSettable()
+   * @model
+   * @generated
+   */
+  Bz387752_Enum getEnumSettable();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumSettable <em>Enum Settable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enum Settable</em>' attribute.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-	 * @see #getEnumSettable()
-	 * @generated
-	 */
-	void setEnumSettable(Bz387752_Enum value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumSettable <em>Enum Settable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Enum Settable</em>' attribute.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+   * @see #getEnumSettable()
+   * @generated
+   */
+  void setEnumSettable(Bz387752_Enum value);
 
-	/**
-	 * Returns the value of the '<em><b>Enum Unsettable</b></em>' attribute.
-	 * The default value is <code>"VAL1"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enum Unsettable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enum Unsettable</em>' attribute.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-	 * @see #isSetEnumUnsettable()
-	 * @see #unsetEnumUnsettable()
-	 * @see #setEnumUnsettable(Bz387752_Enum)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_EnumUnsettable()
-	 * @model default="VAL1" unsettable="true"
-	 * @generated
-	 */
-	Bz387752_Enum getEnumUnsettable();
+  /**
+   * Returns the value of the '<em><b>Enum Unsettable</b></em>' attribute.
+   * The default value is <code>"VAL1"</code>.
+   * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Enum Unsettable</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Enum Unsettable</em>' attribute.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+   * @see #isSetEnumUnsettable()
+   * @see #unsetEnumUnsettable()
+   * @see #setEnumUnsettable(Bz387752_Enum)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz387752_Main_EnumUnsettable()
+   * @model default="VAL1" unsettable="true"
+   * @generated
+   */
+  Bz387752_Enum getEnumUnsettable();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enum Unsettable</em>' attribute.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-	 * @see #isSetEnumUnsettable()
-	 * @see #unsetEnumUnsettable()
-	 * @see #getEnumUnsettable()
-	 * @generated
-	 */
-	void setEnumUnsettable(Bz387752_Enum value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Enum Unsettable</em>' attribute.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+   * @see #isSetEnumUnsettable()
+   * @see #unsetEnumUnsettable()
+   * @see #getEnumUnsettable()
+   * @generated
+   */
+  void setEnumUnsettable(Bz387752_Enum value);
 
-	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetEnumUnsettable()
-	 * @see #getEnumUnsettable()
-	 * @see #setEnumUnsettable(Bz387752_Enum)
-	 * @generated
-	 */
-	void unsetEnumUnsettable();
+  /**
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isSetEnumUnsettable()
+   * @see #getEnumUnsettable()
+   * @see #setEnumUnsettable(Bz387752_Enum)
+   * @generated
+   */
+  void unsetEnumUnsettable();
 
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Enum Unsettable</em>' attribute is set.
-	 * @see #unsetEnumUnsettable()
-	 * @see #getEnumUnsettable()
-	 * @see #setEnumUnsettable(Bz387752_Enum)
-	 * @generated
-	 */
-	boolean isSetEnumUnsettable();
+  /**
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}' attribute is set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return whether the value of the '<em>Enum Unsettable</em>' attribute is set.
+   * @see #unsetEnumUnsettable()
+   * @see #getEnumUnsettable()
+   * @see #setEnumUnsettable(Bz387752_Enum)
+   * @generated
+   */
+  boolean isSetEnumUnsettable();
 
 } // Bz387752_Main
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java
index b58bac31e1..e5e0191eb2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
 
 import org.eclipse.emf.ecore.EObject;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Bz397682 C</b></em>'.
@@ -31,86 +30,87 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Bz397682C extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Ref To P</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref To P</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref To P</em>' container reference.
-	 * @see #setRefToP(Bz397682P)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_RefToP()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC
-	 * @model opposite="listOfC" transient="false"
-	 * @generated
-	 */
-	Bz397682P getRefToP();
+public interface Bz397682C extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Ref To P</b></em>' container reference.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Ref To P</em>' container reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Ref To P</em>' container reference.
+   * @see #setRefToP(Bz397682P)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_RefToP()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC
+   * @model opposite="listOfC" transient="false"
+   * @generated
+   */
+  Bz397682P getRefToP();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref To P</em>' container reference.
-	 * @see #getRefToP()
-	 * @generated
-	 */
-	void setRefToP(Bz397682P value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}' container reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Ref To P</em>' container reference.
+   * @see #getRefToP()
+   * @generated
+   */
+  void setRefToP(Bz397682P value);
 
-	/**
-	 * Returns the value of the '<em><b>Ref To C</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref To C</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref To C</em>' reference.
-	 * @see #setRefToC(Bz397682C)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_RefToC()
-	 * @model
-	 * @generated
-	 */
-	Bz397682C getRefToC();
+  /**
+   * Returns the value of the '<em><b>Ref To C</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Ref To C</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Ref To C</em>' reference.
+   * @see #setRefToC(Bz397682C)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_RefToC()
+   * @model
+   * @generated
+   */
+  Bz397682C getRefToC();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref To C</em>' reference.
-	 * @see #getRefToC()
-	 * @generated
-	 */
-	void setRefToC(Bz397682C value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Ref To C</em>' reference.
+   * @see #getRefToC()
+   * @generated
+   */
+  void setRefToC(Bz397682C value);
 
-	/**
-	 * Returns the value of the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
-	 * @see #setDbId(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_DbId()
-	 * @model required="true"
-	 *        annotation="teneo.jpa value='@Id'"
-	 * @generated
-	 */
-	String getDbId();
+  /**
+   * Returns the value of the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
+   * @see #setDbId(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_DbId()
+   * @model required="true"
+   *        annotation="teneo.jpa value='@Id'"
+   * @generated
+   */
+  String getDbId();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Db Id</em>' attribute.
-	 * @see #getDbId()
-	 * @generated
-	 */
-	void setDbId(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Db Id</em>' attribute.
+   * @see #getDbId()
+   * @generated
+   */
+  void setDbId(String value);
 
 } // Bz397682C
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java
index 01fd425fcf..8ea9e0b825 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -31,50 +30,51 @@ import org.eclipse.emf.ecore.EObject;
  * @model annotation="teneo.jpa value='@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)'"
  * @generated
  */
-public interface Bz397682P extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
-	 * @see #setDbId(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P_DbId()
-	 * @model required="true"
-	 *        annotation="teneo.jpa value='@Id'"
-	 * @generated
-	 */
-	String getDbId();
+public interface Bz397682P extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
+   * @see #setDbId(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P_DbId()
+   * @model required="true"
+   *        annotation="teneo.jpa value='@Id'"
+   * @generated
+   */
+  String getDbId();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Db Id</em>' attribute.
-	 * @see #getDbId()
-	 * @generated
-	 */
-	void setDbId(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Db Id</em>' attribute.
+   * @see #getDbId()
+   * @generated
+   */
+  void setDbId(String value);
 
-	/**
-	 * Returns the value of the '<em><b>List Of C</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>List Of C</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>List Of C</em>' containment reference list.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P_ListOfC()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP
-	 * @model opposite="refToP" containment="true"
-	 * @generated
-	 */
-	EList<Bz397682C> getListOfC();
+  /**
+   * Returns the value of the '<em><b>List Of C</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>List Of C</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>List Of C</em>' containment reference list.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P_ListOfC()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP
+   * @model opposite="refToP" containment="true"
+   * @generated
+   */
+  EList<Bz397682C> getListOfC();
 
 } // Bz397682P
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java
index 8727473956..2463b97bc2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -31,50 +30,51 @@ import org.eclipse.emf.ecore.EObject;
  * @model annotation="teneo.jpa value='@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)'"
  * @generated
  */
-public interface Bz398057A extends EObject {
-	/**
-	 * Returns the value of the '<em><b>List Of B</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>List Of B</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>List Of B</em>' containment reference list.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_ListOfB()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA
-	 * @model opposite="refToClassA" containment="true"
-	 * @generated
-	 */
-	EList<Bz398057B> getListOfB();
+public interface Bz398057A extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>List Of B</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>List Of B</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>List Of B</em>' containment reference list.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_ListOfB()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA
+   * @model opposite="refToClassA" containment="true"
+   * @generated
+   */
+  EList<Bz398057B> getListOfB();
 
-	/**
-	 * Returns the value of the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
-	 * @see #setDbId(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_DbId()
-	 * @model required="true"
-	 *        annotation="teneo.jpa value='@Id'"
-	 * @generated
-	 */
-	String getDbId();
+  /**
+   * Returns the value of the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
+   * @see #setDbId(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_DbId()
+   * @model required="true"
+   *        annotation="teneo.jpa value='@Id'"
+   * @generated
+   */
+  String getDbId();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Db Id</em>' attribute.
-	 * @see #getDbId()
-	 * @generated
-	 */
-	void setDbId(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Db Id</em>' attribute.
+   * @see #getDbId()
+   * @generated
+   */
+  void setDbId(String value);
 
 } // Bz398057A
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java
index f25e83f4f8..f68b814844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Bz398057 A1</b></em>'.
@@ -21,5 +20,6 @@ package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
  * @model
  * @generated
  */
-public interface Bz398057A1 extends Bz398057A {
+public interface Bz398057A1 extends Bz398057A
+{
 } // Bz398057A1
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java
index e7fb56c35f..259348d8c4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java
@@ -30,86 +30,87 @@ import org.eclipse.emf.ecore.EObject;
  * @model annotation="teneo.jpa value='@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)'"
  * @generated
  */
-public interface Bz398057B extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Ref To Class A</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref To Class A</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref To Class A</em>' container reference.
-	 * @see #setRefToClassA(Bz398057A)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_RefToClassA()
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB
-	 * @model opposite="listOfB" transient="false"
-	 * @generated
-	 */
-	Bz398057A getRefToClassA();
+public interface Bz398057B extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Ref To Class A</b></em>' container reference.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Ref To Class A</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Ref To Class A</em>' container reference.
+   * @see #setRefToClassA(Bz398057A)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_RefToClassA()
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB
+   * @model opposite="listOfB" transient="false"
+   * @generated
+   */
+  Bz398057A getRefToClassA();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref To Class A</em>' container reference.
-	 * @see #getRefToClassA()
-	 * @generated
-	 */
-	void setRefToClassA(Bz398057A value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}' container reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Ref To Class A</em>' container reference.
+   * @see #getRefToClassA()
+   * @generated
+   */
+  void setRefToClassA(Bz398057A 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(double)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_Value()
-	 * @model
-	 * @generated
-	 */
-	double getValue();
+  /**
+   * 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(double)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_Value()
+   * @model
+   * @generated
+   */
+  double getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#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(double value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#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(double value);
 
-	/**
-	 * Returns the value of the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
-	 * @see #setDbId(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_DbId()
-	 * @model required="true"
-	 *        annotation="teneo.jpa value='@Id'"
-	 * @generated
-	 */
-	String getDbId();
+  /**
+   * Returns the value of the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Db 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>Db Id</em>' attribute.
+   * @see #setDbId(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_DbId()
+   * @model required="true"
+   *        annotation="teneo.jpa value='@Id'"
+   * @generated
+   */
+  String getDbId();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Db Id</em>' attribute.
-	 * @see #getDbId()
-	 * @generated
-	 */
-	void setDbId(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Db Id</em>' attribute.
+   * @see #getDbId()
+   * @generated
+   */
+  void setDbId(String value);
 
 } // Bz398057B
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java
index 5689627f29..7fe2138af9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Bz398057 B1</b></em>'.
@@ -27,31 +26,32 @@ package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
  * @model
  * @generated
  */
-public interface Bz398057B1 extends Bz398057B {
+public interface Bz398057B1 extends Bz398057B
+{
 
-	/**
-	 * Returns the value of the '<em><b>Value Str</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Str</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 Str</em>' attribute.
-	 * @see #setValueStr(String)
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B1_ValueStr()
-	 * @model
-	 * @generated
-	 */
-	String getValueStr();
+  /**
+   * Returns the value of the '<em><b>Value Str</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Value Str</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 Str</em>' attribute.
+   * @see #setValueStr(String)
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B1_ValueStr()
+   * @model
+   * @generated
+   */
+  String getValueStr();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Str</em>' attribute.
-	 * @see #getValueStr()
-	 * @generated
-	 */
-	void setValueStr(String value);
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Value Str</em>' attribute.
+   * @see #getValueStr()
+   * @generated
+   */
+  void setValueStr(String value);
 } // Bz398057B1
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
index 0c75fe5905..851fd867a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
@@ -20,139 +20,141 @@ import org.eclipse.emf.ecore.EFactory;
  * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage
  * @generated
  */
-public interface HibernateTestFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	HibernateTestFactory eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Bz356181 Main</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz356181 Main</em>'.
-	 * @generated
-	 */
-	Bz356181_Main createBz356181_Main();
-
-	/**
-	 * Returns a new object of class '<em>Bz356181 Transient</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz356181 Transient</em>'.
-	 * @generated
-	 */
-	Bz356181_Transient createBz356181_Transient();
-
-	/**
-	 * Returns a new object of class '<em>Bz356181 Non Transient</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz356181 Non Transient</em>'.
-	 * @generated
-	 */
-	Bz356181_NonTransient createBz356181_NonTransient();
-
-	/**
-	 * Returns a new object of class '<em>Bz387752 Main</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz387752 Main</em>'.
-	 * @generated
-	 */
-	Bz387752_Main createBz387752_Main();
-
-	/**
-	 * Returns a new object of class '<em>Bz380987 Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz380987 Group</em>'.
-	 * @generated
-	 */
-	Bz380987_Group createBz380987_Group();
-
-	/**
-	 * Returns a new object of class '<em>Bz380987 Place</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz380987 Place</em>'.
-	 * @generated
-	 */
-	Bz380987_Place createBz380987_Place();
-
-	/**
-	 * Returns a new object of class '<em>Bz380987 Person</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz380987 Person</em>'.
-	 * @generated
-	 */
-	Bz380987_Person createBz380987_Person();
-
-	/**
-	 * Returns a new object of class '<em>Bz398057 A</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz398057 A</em>'.
-	 * @generated
-	 */
-	Bz398057A createBz398057A();
-
-	/**
-	 * Returns a new object of class '<em>Bz398057 A1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz398057 A1</em>'.
-	 * @generated
-	 */
-	Bz398057A1 createBz398057A1();
-
-	/**
-	 * Returns a new object of class '<em>Bz398057 B</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz398057 B</em>'.
-	 * @generated
-	 */
-	Bz398057B createBz398057B();
-
-	/**
-	 * Returns a new object of class '<em>Bz398057 B1</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz398057 B1</em>'.
-	 * @generated
-	 */
-	Bz398057B1 createBz398057B1();
-
-	/**
-	 * Returns a new object of class '<em>Bz397682 P</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz397682 P</em>'.
-	 * @generated
-	 */
-	Bz397682P createBz397682P();
-
-	/**
-	 * Returns a new object of class '<em>Bz397682 C</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bz397682 C</em>'.
-	 * @generated
-	 */
-	Bz397682C createBz397682C();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	HibernateTestPackage getHibernateTestPackage();
-
-} //HibernateTestFactory
+public interface HibernateTestFactory extends EFactory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  HibernateTestFactory eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestFactoryImpl
+      .init();
+
+  /**
+   * Returns a new object of class '<em>Bz356181 Main</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz356181 Main</em>'.
+   * @generated
+   */
+  Bz356181_Main createBz356181_Main();
+
+  /**
+   * Returns a new object of class '<em>Bz356181 Transient</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz356181 Transient</em>'.
+   * @generated
+   */
+  Bz356181_Transient createBz356181_Transient();
+
+  /**
+   * Returns a new object of class '<em>Bz356181 Non Transient</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz356181 Non Transient</em>'.
+   * @generated
+   */
+  Bz356181_NonTransient createBz356181_NonTransient();
+
+  /**
+   * Returns a new object of class '<em>Bz387752 Main</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz387752 Main</em>'.
+   * @generated
+   */
+  Bz387752_Main createBz387752_Main();
+
+  /**
+   * Returns a new object of class '<em>Bz380987 Group</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz380987 Group</em>'.
+   * @generated
+   */
+  Bz380987_Group createBz380987_Group();
+
+  /**
+   * Returns a new object of class '<em>Bz380987 Place</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz380987 Place</em>'.
+   * @generated
+   */
+  Bz380987_Place createBz380987_Place();
+
+  /**
+   * Returns a new object of class '<em>Bz380987 Person</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz380987 Person</em>'.
+   * @generated
+   */
+  Bz380987_Person createBz380987_Person();
+
+  /**
+   * Returns a new object of class '<em>Bz398057 A</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz398057 A</em>'.
+   * @generated
+   */
+  Bz398057A createBz398057A();
+
+  /**
+   * Returns a new object of class '<em>Bz398057 A1</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz398057 A1</em>'.
+   * @generated
+   */
+  Bz398057A1 createBz398057A1();
+
+  /**
+   * Returns a new object of class '<em>Bz398057 B</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz398057 B</em>'.
+   * @generated
+   */
+  Bz398057B createBz398057B();
+
+  /**
+   * Returns a new object of class '<em>Bz398057 B1</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz398057 B1</em>'.
+   * @generated
+   */
+  Bz398057B1 createBz398057B1();
+
+  /**
+   * Returns a new object of class '<em>Bz397682 P</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz397682 P</em>'.
+   * @generated
+   */
+  Bz397682P createBz397682P();
+
+  /**
+   * Returns a new object of class '<em>Bz397682 C</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Bz397682 C</em>'.
+   * @generated
+   */
+  Bz397682C createBz397682C();
+
+  /**
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the package supported by this factory.
+   * @generated
+   */
+  HibernateTestPackage getHibernateTestPackage();
+
+} // HibernateTestFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
index 6d2d095cde..bae20cb0c9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
@@ -31,1373 +31,1374 @@ import org.eclipse.emf.ecore.EReference;
  * @model kind="package"
  * @generated
  */
-public interface HibernateTestPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "HibernateTest";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://org.eclipse.emf.cdo.tests.hibernate";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "hibernatetests";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	HibernateTestPackage eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl <em>Bz356181 Main</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Main()
-	 * @generated
-	 */
-	int BZ356181_MAIN = 0;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_MAIN__TRANSIENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Non Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_MAIN__NON_TRANSIENT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Transient Ref</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_MAIN__TRANSIENT_REF = 2;
-
-	/**
-	 * The feature id for the '<em><b>Transient Other Ref</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_MAIN__TRANSIENT_OTHER_REF = 3;
-
-	/**
-	 * The number of structural features of the '<em>Bz356181 Main</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_MAIN_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl <em>Bz356181 Transient</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Transient()
-	 * @generated
-	 */
-	int BZ356181_TRANSIENT = 1;
-
-	/**
-	 * The number of structural features of the '<em>Bz356181 Transient</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_TRANSIENT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl <em>Bz356181 Non Transient</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_NonTransient()
-	 * @generated
-	 */
-	int BZ356181_NON_TRANSIENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Main</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_NON_TRANSIENT__MAIN = 0;
-
-	/**
-	 * The number of structural features of the '<em>Bz356181 Non Transient</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ356181_NON_TRANSIENT_FEATURE_COUNT = 1;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl <em>Bz387752 Main</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Main()
-	 * @generated
-	 */
-	int BZ387752_MAIN = 3;
-
-	/**
-	 * The feature id for the '<em><b>Str Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ387752_MAIN__STR_UNSETTABLE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Str Settable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ387752_MAIN__STR_SETTABLE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Enum Settable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ387752_MAIN__ENUM_SETTABLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Enum Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ387752_MAIN__ENUM_UNSETTABLE = 3;
-
-	/**
-	 * The number of structural features of the '<em>Bz387752 Main</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ387752_MAIN_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl <em>Bz380987 Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Group()
-	 * @generated
-	 */
-	int BZ380987_GROUP = 4;
-
-	/**
-	 * The feature id for the '<em><b>People</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_GROUP__PEOPLE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Bz380987 Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_GROUP_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl <em>Bz380987 Place</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Place()
-	 * @generated
-	 */
-	int BZ380987_PLACE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PLACE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>People</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PLACE__PEOPLE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Bz380987 Place</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PLACE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl <em>Bz380987 Person</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Person()
-	 * @generated
-	 */
-	int BZ380987_PERSON = 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PERSON__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PERSON__GROUP = 1;
-
-	/**
-	 * The feature id for the '<em><b>Places</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PERSON__PLACES = 2;
-
-	/**
-	 * The number of structural features of the '<em>Bz380987 Person</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ380987_PERSON_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl <em>Bz398057 A</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A()
-	 * @generated
-	 */
-	int BZ398057_A = 7;
-
-	/**
-	 * The feature id for the '<em><b>List Of B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_A__LIST_OF_B = 0;
-
-	/**
-	 * The feature id for the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_A__DB_ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Bz398057 A</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_A_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A1()
-	 * @generated
-	 */
-	int BZ398057_A1 = 8;
-
-	/**
-	 * The feature id for the '<em><b>List Of B</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_A1__LIST_OF_B = BZ398057_A__LIST_OF_B;
-
-	/**
-	 * The feature id for the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_A1__DB_ID = BZ398057_A__DB_ID;
-
-	/**
-	 * The number of structural features of the '<em>Bz398057 A1</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_A1_FEATURE_COUNT = BZ398057_A_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl <em>Bz398057 B</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B()
-	 * @generated
-	 */
-	int BZ398057_B = 9;
-
-	/**
-	 * The feature id for the '<em><b>Ref To Class A</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B__REF_TO_CLASS_A = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B__VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B__DB_ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Bz398057 B</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B1()
-	 * @generated
-	 */
-	int BZ398057_B1 = 10;
-
-	/**
-	 * The feature id for the '<em><b>Ref To Class A</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B1__REF_TO_CLASS_A = BZ398057_B__REF_TO_CLASS_A;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B1__VALUE = BZ398057_B__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B1__DB_ID = BZ398057_B__DB_ID;
-
-	/**
-	 * The feature id for the '<em><b>Value Str</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B1__VALUE_STR = BZ398057_B_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Bz398057 B1</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ398057_B1_FEATURE_COUNT = BZ398057_B_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl <em>Bz397682 P</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682P()
-	 * @generated
-	 */
-	int BZ397682_P = 11;
-
-	/**
-	 * The feature id for the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_P__DB_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>List Of C</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_P__LIST_OF_C = 1;
-
-	/**
-	 * The number of structural features of the '<em>Bz397682 P</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_P_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl <em>Bz397682 C</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682C()
-	 * @generated
-	 */
-	int BZ397682_C = 12;
-
-	/**
-	 * The feature id for the '<em><b>Ref To P</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_C__REF_TO_P = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ref To C</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_C__REF_TO_C = 1;
-
-	/**
-	 * The feature id for the '<em><b>Db Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_C__DB_ID = 2;
-
-	/**
-	 * The number of structural features of the '<em>Bz397682 C</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BZ397682_C_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Enum()
-	 * @generated
-	 */
-	int BZ387752_ENUM = 13;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main <em>Bz356181 Main</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz356181 Main</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main
-	 * @generated
-	 */
-	EClass getBz356181_Main();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransient <em>Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transient</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransient()
-	 * @see #getBz356181_Main()
-	 * @generated
-	 */
-	EAttribute getBz356181_Main_Transient();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getNonTransient <em>Non Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Non Transient</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getNonTransient()
-	 * @see #getBz356181_Main()
-	 * @generated
-	 */
-	EAttribute getBz356181_Main_NonTransient();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientRef <em>Transient Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Transient Ref</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientRef()
-	 * @see #getBz356181_Main()
-	 * @generated
-	 */
-	EReference getBz356181_Main_TransientRef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientOtherRef <em>Transient Other Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Transient Other Ref</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientOtherRef()
-	 * @see #getBz356181_Main()
-	 * @generated
-	 */
-	EReference getBz356181_Main_TransientOtherRef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient <em>Bz356181 Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz356181 Transient</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient
-	 * @generated
-	 */
-	EClass getBz356181_Transient();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient <em>Bz356181 Non Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz356181 Non Transient</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient
-	 * @generated
-	 */
-	EClass getBz356181_NonTransient();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient#getMain <em>Main</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Main</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient#getMain()
-	 * @see #getBz356181_NonTransient()
-	 * @generated
-	 */
-	EReference getBz356181_NonTransient_Main();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main <em>Bz387752 Main</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz387752 Main</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main
-	 * @generated
-	 */
-	EClass getBz387752_Main();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Str Unsettable</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable()
-	 * @see #getBz387752_Main()
-	 * @generated
-	 */
-	EAttribute getBz387752_Main_StrUnsettable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrSettable <em>Str Settable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Str Settable</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrSettable()
-	 * @see #getBz387752_Main()
-	 * @generated
-	 */
-	EAttribute getBz387752_Main_StrSettable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumSettable <em>Enum Settable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enum Settable</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumSettable()
-	 * @see #getBz387752_Main()
-	 * @generated
-	 */
-	EAttribute getBz387752_Main_EnumSettable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enum Unsettable</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable()
-	 * @see #getBz387752_Main()
-	 * @generated
-	 */
-	EAttribute getBz387752_Main_EnumUnsettable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group <em>Bz380987 Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz380987 Group</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group
-	 * @generated
-	 */
-	EClass getBz380987_Group();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople <em>People</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>People</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople()
-	 * @see #getBz380987_Group()
-	 * @generated
-	 */
-	EReference getBz380987_Group_People();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place <em>Bz380987 Place</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz380987 Place</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place
-	 * @generated
-	 */
-	EClass getBz380987_Place();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getName()
-	 * @see #getBz380987_Place()
-	 * @generated
-	 */
-	EAttribute getBz380987_Place_Name();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople <em>People</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>People</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople()
-	 * @see #getBz380987_Place()
-	 * @generated
-	 */
-	EReference getBz380987_Place_People();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person <em>Bz380987 Person</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz380987 Person</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person
-	 * @generated
-	 */
-	EClass getBz380987_Person();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getName()
-	 * @see #getBz380987_Person()
-	 * @generated
-	 */
-	EAttribute getBz380987_Person_Name();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup <em>Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Group</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup()
-	 * @see #getBz380987_Person()
-	 * @generated
-	 */
-	EReference getBz380987_Person_Group();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces <em>Places</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Places</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces()
-	 * @see #getBz380987_Person()
-	 * @generated
-	 */
-	EReference getBz380987_Person_Places();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A <em>Bz398057 A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz398057 A</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A
-	 * @generated
-	 */
-	EClass getBz398057A();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>List Of B</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB()
-	 * @see #getBz398057A()
-	 * @generated
-	 */
-	EReference getBz398057A_ListOfB();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Db Id</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId()
-	 * @see #getBz398057A()
-	 * @generated
-	 */
-	EAttribute getBz398057A_DbId();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz398057 A1</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1
-	 * @generated
-	 */
-	EClass getBz398057A1();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B <em>Bz398057 B</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz398057 B</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B
-	 * @generated
-	 */
-	EClass getBz398057B();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Ref To Class A</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA()
-	 * @see #getBz398057B()
-	 * @generated
-	 */
-	EReference getBz398057B_RefToClassA();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue()
-	 * @see #getBz398057B()
-	 * @generated
-	 */
-	EAttribute getBz398057B_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Db Id</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId()
-	 * @see #getBz398057B()
-	 * @generated
-	 */
-	EAttribute getBz398057B_DbId();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz398057 B1</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1
-	 * @generated
-	 */
-	EClass getBz398057B1();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value Str</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr()
-	 * @see #getBz398057B1()
-	 * @generated
-	 */
-	EAttribute getBz398057B1_ValueStr();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P <em>Bz397682 P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz397682 P</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P
-	 * @generated
-	 */
-	EClass getBz397682P();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Db Id</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId()
-	 * @see #getBz397682P()
-	 * @generated
-	 */
-	EAttribute getBz397682P_DbId();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>List Of C</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC()
-	 * @see #getBz397682P()
-	 * @generated
-	 */
-	EReference getBz397682P_ListOfC();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C <em>Bz397682 C</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bz397682 C</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C
-	 * @generated
-	 */
-	EClass getBz397682C();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Ref To P</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP()
-	 * @see #getBz397682C()
-	 * @generated
-	 */
-	EReference getBz397682C_RefToP();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Ref To C</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC()
-	 * @see #getBz397682C()
-	 * @generated
-	 */
-	EReference getBz397682C_RefToC();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Db Id</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId()
-	 * @see #getBz397682C()
-	 * @generated
-	 */
-	EAttribute getBz397682C_DbId();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Bz387752 Enum</em>'.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-	 * @generated
-	 */
-	EEnum getBz387752_Enum();
-
-	/**
-	 * 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
-	 */
-	HibernateTestFactory getHibernateTestFactory();
-
-	/**
-	 * <!-- 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.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl <em>Bz356181 Main</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Main()
-		 * @generated
-		 */
-		EClass BZ356181_MAIN = eINSTANCE.getBz356181_Main();
-
-		/**
-		 * The meta object literal for the '<em><b>Transient</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ356181_MAIN__TRANSIENT = eINSTANCE.getBz356181_Main_Transient();
-
-		/**
-		 * The meta object literal for the '<em><b>Non Transient</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ356181_MAIN__NON_TRANSIENT = eINSTANCE.getBz356181_Main_NonTransient();
-
-		/**
-		 * The meta object literal for the '<em><b>Transient Ref</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ356181_MAIN__TRANSIENT_REF = eINSTANCE.getBz356181_Main_TransientRef();
-
-		/**
-		 * The meta object literal for the '<em><b>Transient Other Ref</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ356181_MAIN__TRANSIENT_OTHER_REF = eINSTANCE.getBz356181_Main_TransientOtherRef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl <em>Bz356181 Transient</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Transient()
-		 * @generated
-		 */
-		EClass BZ356181_TRANSIENT = eINSTANCE.getBz356181_Transient();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl <em>Bz356181 Non Transient</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_NonTransient()
-		 * @generated
-		 */
-		EClass BZ356181_NON_TRANSIENT = eINSTANCE.getBz356181_NonTransient();
-
-		/**
-		 * The meta object literal for the '<em><b>Main</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ356181_NON_TRANSIENT__MAIN = eINSTANCE.getBz356181_NonTransient_Main();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl <em>Bz387752 Main</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Main()
-		 * @generated
-		 */
-		EClass BZ387752_MAIN = eINSTANCE.getBz387752_Main();
-
-		/**
-		 * The meta object literal for the '<em><b>Str Unsettable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ387752_MAIN__STR_UNSETTABLE = eINSTANCE.getBz387752_Main_StrUnsettable();
-
-		/**
-		 * The meta object literal for the '<em><b>Str Settable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ387752_MAIN__STR_SETTABLE = eINSTANCE.getBz387752_Main_StrSettable();
-
-		/**
-		 * The meta object literal for the '<em><b>Enum Settable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ387752_MAIN__ENUM_SETTABLE = eINSTANCE.getBz387752_Main_EnumSettable();
-
-		/**
-		 * The meta object literal for the '<em><b>Enum Unsettable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ387752_MAIN__ENUM_UNSETTABLE = eINSTANCE.getBz387752_Main_EnumUnsettable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl <em>Bz380987 Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Group()
-		 * @generated
-		 */
-		EClass BZ380987_GROUP = eINSTANCE.getBz380987_Group();
-
-		/**
-		 * The meta object literal for the '<em><b>People</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ380987_GROUP__PEOPLE = eINSTANCE.getBz380987_Group_People();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl <em>Bz380987 Place</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Place()
-		 * @generated
-		 */
-		EClass BZ380987_PLACE = eINSTANCE.getBz380987_Place();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ380987_PLACE__NAME = eINSTANCE.getBz380987_Place_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>People</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ380987_PLACE__PEOPLE = eINSTANCE.getBz380987_Place_People();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl <em>Bz380987 Person</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Person()
-		 * @generated
-		 */
-		EClass BZ380987_PERSON = eINSTANCE.getBz380987_Person();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ380987_PERSON__NAME = eINSTANCE.getBz380987_Person_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Group</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ380987_PERSON__GROUP = eINSTANCE.getBz380987_Person_Group();
-
-		/**
-		 * The meta object literal for the '<em><b>Places</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ380987_PERSON__PLACES = eINSTANCE.getBz380987_Person_Places();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl <em>Bz398057 A</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A()
-		 * @generated
-		 */
-		EClass BZ398057_A = eINSTANCE.getBz398057A();
-
-		/**
-		 * The meta object literal for the '<em><b>List Of B</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ398057_A__LIST_OF_B = eINSTANCE.getBz398057A_ListOfB();
-
-		/**
-		 * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ398057_A__DB_ID = eINSTANCE.getBz398057A_DbId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A1()
-		 * @generated
-		 */
-		EClass BZ398057_A1 = eINSTANCE.getBz398057A1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl <em>Bz398057 B</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B()
-		 * @generated
-		 */
-		EClass BZ398057_B = eINSTANCE.getBz398057B();
-
-		/**
-		 * The meta object literal for the '<em><b>Ref To Class A</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ398057_B__REF_TO_CLASS_A = eINSTANCE.getBz398057B_RefToClassA();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ398057_B__VALUE = eINSTANCE.getBz398057B_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ398057_B__DB_ID = eINSTANCE.getBz398057B_DbId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B1()
-		 * @generated
-		 */
-		EClass BZ398057_B1 = eINSTANCE.getBz398057B1();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Str</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ398057_B1__VALUE_STR = eINSTANCE.getBz398057B1_ValueStr();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl <em>Bz397682 P</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682P()
-		 * @generated
-		 */
-		EClass BZ397682_P = eINSTANCE.getBz397682P();
-
-		/**
-		 * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ397682_P__DB_ID = eINSTANCE.getBz397682P_DbId();
-
-		/**
-		 * The meta object literal for the '<em><b>List Of C</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ397682_P__LIST_OF_C = eINSTANCE.getBz397682P_ListOfC();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl <em>Bz397682 C</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682C()
-		 * @generated
-		 */
-		EClass BZ397682_C = eINSTANCE.getBz397682C();
-
-		/**
-		 * The meta object literal for the '<em><b>Ref To P</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ397682_C__REF_TO_P = eINSTANCE.getBz397682C_RefToP();
-
-		/**
-		 * The meta object literal for the '<em><b>Ref To C</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BZ397682_C__REF_TO_C = eINSTANCE.getBz397682C_RefToC();
-
-		/**
-		 * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BZ397682_C__DB_ID = eINSTANCE.getBz397682C_DbId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
-		 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Enum()
-		 * @generated
-		 */
-		EEnum BZ387752_ENUM = eINSTANCE.getBz387752_Enum();
-
-	}
-
-} //HibernateTestPackage
+public interface HibernateTestPackage extends EPackage
+{
+  /**
+   * The package name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNAME = "HibernateTest";
+
+  /**
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_URI = "http://org.eclipse.emf.cdo.tests.hibernate";
+
+  /**
+   * The package namespace name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_PREFIX = "hibernatetests";
+
+  /**
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  HibernateTestPackage eINSTANCE = org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl
+      .init();
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl <em>Bz356181 Main</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Main()
+   * @generated
+   */
+  int BZ356181_MAIN = 0;
+
+  /**
+   * The feature id for the '<em><b>Transient</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_MAIN__TRANSIENT = 0;
+
+  /**
+   * The feature id for the '<em><b>Non Transient</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_MAIN__NON_TRANSIENT = 1;
+
+  /**
+   * The feature id for the '<em><b>Transient Ref</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_MAIN__TRANSIENT_REF = 2;
+
+  /**
+   * The feature id for the '<em><b>Transient Other Ref</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_MAIN__TRANSIENT_OTHER_REF = 3;
+
+  /**
+   * The number of structural features of the '<em>Bz356181 Main</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_MAIN_FEATURE_COUNT = 4;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl <em>Bz356181 Transient</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Transient()
+   * @generated
+   */
+  int BZ356181_TRANSIENT = 1;
+
+  /**
+   * The number of structural features of the '<em>Bz356181 Transient</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_TRANSIENT_FEATURE_COUNT = 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl <em>Bz356181 Non Transient</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_NonTransient()
+   * @generated
+   */
+  int BZ356181_NON_TRANSIENT = 2;
+
+  /**
+   * The feature id for the '<em><b>Main</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_NON_TRANSIENT__MAIN = 0;
+
+  /**
+   * The number of structural features of the '<em>Bz356181 Non Transient</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ356181_NON_TRANSIENT_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl <em>Bz387752 Main</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Main()
+   * @generated
+   */
+  int BZ387752_MAIN = 3;
+
+  /**
+   * The feature id for the '<em><b>Str Unsettable</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ387752_MAIN__STR_UNSETTABLE = 0;
+
+  /**
+   * The feature id for the '<em><b>Str Settable</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ387752_MAIN__STR_SETTABLE = 1;
+
+  /**
+   * The feature id for the '<em><b>Enum Settable</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ387752_MAIN__ENUM_SETTABLE = 2;
+
+  /**
+   * The feature id for the '<em><b>Enum Unsettable</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ387752_MAIN__ENUM_UNSETTABLE = 3;
+
+  /**
+   * The number of structural features of the '<em>Bz387752 Main</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ387752_MAIN_FEATURE_COUNT = 4;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl <em>Bz380987 Group</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Group()
+   * @generated
+   */
+  int BZ380987_GROUP = 4;
+
+  /**
+   * The feature id for the '<em><b>People</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_GROUP__PEOPLE = 0;
+
+  /**
+   * The number of structural features of the '<em>Bz380987 Group</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_GROUP_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl <em>Bz380987 Place</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Place()
+   * @generated
+   */
+  int BZ380987_PLACE = 5;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PLACE__NAME = 0;
+
+  /**
+   * The feature id for the '<em><b>People</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PLACE__PEOPLE = 1;
+
+  /**
+   * The number of structural features of the '<em>Bz380987 Place</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PLACE_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl <em>Bz380987 Person</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Person()
+   * @generated
+   */
+  int BZ380987_PERSON = 6;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PERSON__NAME = 0;
+
+  /**
+   * The feature id for the '<em><b>Group</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PERSON__GROUP = 1;
+
+  /**
+   * The feature id for the '<em><b>Places</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PERSON__PLACES = 2;
+
+  /**
+   * The number of structural features of the '<em>Bz380987 Person</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ380987_PERSON_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl <em>Bz398057 A</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A()
+   * @generated
+   */
+  int BZ398057_A = 7;
+
+  /**
+   * The feature id for the '<em><b>List Of B</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_A__LIST_OF_B = 0;
+
+  /**
+   * The feature id for the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_A__DB_ID = 1;
+
+  /**
+   * The number of structural features of the '<em>Bz398057 A</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_A_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A1()
+   * @generated
+   */
+  int BZ398057_A1 = 8;
+
+  /**
+   * The feature id for the '<em><b>List Of B</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_A1__LIST_OF_B = BZ398057_A__LIST_OF_B;
+
+  /**
+   * The feature id for the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_A1__DB_ID = BZ398057_A__DB_ID;
+
+  /**
+   * The number of structural features of the '<em>Bz398057 A1</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_A1_FEATURE_COUNT = BZ398057_A_FEATURE_COUNT + 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl <em>Bz398057 B</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B()
+   * @generated
+   */
+  int BZ398057_B = 9;
+
+  /**
+   * The feature id for the '<em><b>Ref To Class A</b></em>' container reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B__REF_TO_CLASS_A = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B__VALUE = 1;
+
+  /**
+   * The feature id for the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B__DB_ID = 2;
+
+  /**
+   * The number of structural features of the '<em>Bz398057 B</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B1()
+   * @generated
+   */
+  int BZ398057_B1 = 10;
+
+  /**
+   * The feature id for the '<em><b>Ref To Class A</b></em>' container reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B1__REF_TO_CLASS_A = BZ398057_B__REF_TO_CLASS_A;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B1__VALUE = BZ398057_B__VALUE;
+
+  /**
+   * The feature id for the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B1__DB_ID = BZ398057_B__DB_ID;
+
+  /**
+   * The feature id for the '<em><b>Value Str</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B1__VALUE_STR = BZ398057_B_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Bz398057 B1</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ398057_B1_FEATURE_COUNT = BZ398057_B_FEATURE_COUNT + 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl <em>Bz397682 P</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682P()
+   * @generated
+   */
+  int BZ397682_P = 11;
+
+  /**
+   * The feature id for the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_P__DB_ID = 0;
+
+  /**
+   * The feature id for the '<em><b>List Of C</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_P__LIST_OF_C = 1;
+
+  /**
+   * The number of structural features of the '<em>Bz397682 P</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_P_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl <em>Bz397682 C</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682C()
+   * @generated
+   */
+  int BZ397682_C = 12;
+
+  /**
+   * The feature id for the '<em><b>Ref To P</b></em>' container reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_C__REF_TO_P = 0;
+
+  /**
+   * The feature id for the '<em><b>Ref To C</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_C__REF_TO_C = 1;
+
+  /**
+   * The feature id for the '<em><b>Db Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_C__DB_ID = 2;
+
+  /**
+   * The number of structural features of the '<em>Bz397682 C</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BZ397682_C_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Enum()
+   * @generated
+   */
+  int BZ387752_ENUM = 13;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main <em>Bz356181 Main</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz356181 Main</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main
+   * @generated
+   */
+  EClass getBz356181_Main();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransient <em>Transient</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Transient</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransient()
+   * @see #getBz356181_Main()
+   * @generated
+   */
+  EAttribute getBz356181_Main_Transient();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getNonTransient <em>Non Transient</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Non Transient</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getNonTransient()
+   * @see #getBz356181_Main()
+   * @generated
+   */
+  EAttribute getBz356181_Main_NonTransient();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientRef <em>Transient Ref</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Transient Ref</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientRef()
+   * @see #getBz356181_Main()
+   * @generated
+   */
+  EReference getBz356181_Main_TransientRef();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientOtherRef <em>Transient Other Ref</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Transient Other Ref</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main#getTransientOtherRef()
+   * @see #getBz356181_Main()
+   * @generated
+   */
+  EReference getBz356181_Main_TransientOtherRef();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient <em>Bz356181 Transient</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz356181 Transient</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient
+   * @generated
+   */
+  EClass getBz356181_Transient();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient <em>Bz356181 Non Transient</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz356181 Non Transient</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient
+   * @generated
+   */
+  EClass getBz356181_NonTransient();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient#getMain <em>Main</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Main</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient#getMain()
+   * @see #getBz356181_NonTransient()
+   * @generated
+   */
+  EReference getBz356181_NonTransient_Main();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main <em>Bz387752 Main</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz387752 Main</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main
+   * @generated
+   */
+  EClass getBz387752_Main();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable <em>Str Unsettable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Str Unsettable</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrUnsettable()
+   * @see #getBz387752_Main()
+   * @generated
+   */
+  EAttribute getBz387752_Main_StrUnsettable();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrSettable <em>Str Settable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Str Settable</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getStrSettable()
+   * @see #getBz387752_Main()
+   * @generated
+   */
+  EAttribute getBz387752_Main_StrSettable();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumSettable <em>Enum Settable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Enum Settable</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumSettable()
+   * @see #getBz387752_Main()
+   * @generated
+   */
+  EAttribute getBz387752_Main_EnumSettable();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable <em>Enum Unsettable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Enum Unsettable</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main#getEnumUnsettable()
+   * @see #getBz387752_Main()
+   * @generated
+   */
+  EAttribute getBz387752_Main_EnumUnsettable();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group <em>Bz380987 Group</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz380987 Group</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group
+   * @generated
+   */
+  EClass getBz380987_Group();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople <em>People</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>People</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group#getPeople()
+   * @see #getBz380987_Group()
+   * @generated
+   */
+  EReference getBz380987_Group_People();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place <em>Bz380987 Place</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz380987 Place</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place
+   * @generated
+   */
+  EClass getBz380987_Place();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getName()
+   * @see #getBz380987_Place()
+   * @generated
+   */
+  EAttribute getBz380987_Place_Name();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople <em>People</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>People</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place#getPeople()
+   * @see #getBz380987_Place()
+   * @generated
+   */
+  EReference getBz380987_Place_People();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person <em>Bz380987 Person</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz380987 Person</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person
+   * @generated
+   */
+  EClass getBz380987_Person();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getName()
+   * @see #getBz380987_Person()
+   * @generated
+   */
+  EAttribute getBz380987_Person_Name();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup <em>Group</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Group</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getGroup()
+   * @see #getBz380987_Person()
+   * @generated
+   */
+  EReference getBz380987_Person_Group();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces <em>Places</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Places</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person#getPlaces()
+   * @see #getBz380987_Person()
+   * @generated
+   */
+  EReference getBz380987_Person_Places();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A <em>Bz398057 A</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz398057 A</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A
+   * @generated
+   */
+  EClass getBz398057A();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>List Of B</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB()
+   * @see #getBz398057A()
+   * @generated
+   */
+  EReference getBz398057A_ListOfB();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Db Id</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId()
+   * @see #getBz398057A()
+   * @generated
+   */
+  EAttribute getBz398057A_DbId();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz398057 A1</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1
+   * @generated
+   */
+  EClass getBz398057A1();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B <em>Bz398057 B</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz398057 B</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B
+   * @generated
+   */
+  EClass getBz398057B();
+
+  /**
+   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the container reference '<em>Ref To Class A</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA()
+   * @see #getBz398057B()
+   * @generated
+   */
+  EReference getBz398057B_RefToClassA();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue <em>Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue()
+   * @see #getBz398057B()
+   * @generated
+   */
+  EAttribute getBz398057B_Value();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Db Id</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId()
+   * @see #getBz398057B()
+   * @generated
+   */
+  EAttribute getBz398057B_DbId();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz398057 B1</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1
+   * @generated
+   */
+  EClass getBz398057B1();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Value Str</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr()
+   * @see #getBz398057B1()
+   * @generated
+   */
+  EAttribute getBz398057B1_ValueStr();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P <em>Bz397682 P</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz397682 P</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P
+   * @generated
+   */
+  EClass getBz397682P();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Db Id</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId()
+   * @see #getBz397682P()
+   * @generated
+   */
+  EAttribute getBz397682P_DbId();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>List Of C</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC()
+   * @see #getBz397682P()
+   * @generated
+   */
+  EReference getBz397682P_ListOfC();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C <em>Bz397682 C</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Bz397682 C</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C
+   * @generated
+   */
+  EClass getBz397682C();
+
+  /**
+   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the container reference '<em>Ref To P</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP()
+   * @see #getBz397682C()
+   * @generated
+   */
+  EReference getBz397682C_RefToP();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Ref To C</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC()
+   * @see #getBz397682C()
+   * @generated
+   */
+  EReference getBz397682C_RefToC();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Db Id</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId()
+   * @see #getBz397682C()
+   * @generated
+   */
+  EAttribute getBz397682C_DbId();
+
+  /**
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for enum '<em>Bz387752 Enum</em>'.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+   * @generated
+   */
+  EEnum getBz387752_Enum();
+
+  /**
+   * 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
+   */
+  HibernateTestFactory getHibernateTestFactory();
+
+  /**
+   * <!-- 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.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl <em>Bz356181 Main</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_MainImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Main()
+     * @generated
+     */
+    EClass BZ356181_MAIN = eINSTANCE.getBz356181_Main();
+
+    /**
+     * The meta object literal for the '<em><b>Transient</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ356181_MAIN__TRANSIENT = eINSTANCE.getBz356181_Main_Transient();
+
+    /**
+     * The meta object literal for the '<em><b>Non Transient</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ356181_MAIN__NON_TRANSIENT = eINSTANCE.getBz356181_Main_NonTransient();
+
+    /**
+     * The meta object literal for the '<em><b>Transient Ref</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ356181_MAIN__TRANSIENT_REF = eINSTANCE.getBz356181_Main_TransientRef();
+
+    /**
+     * The meta object literal for the '<em><b>Transient Other Ref</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ356181_MAIN__TRANSIENT_OTHER_REF = eINSTANCE.getBz356181_Main_TransientOtherRef();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl <em>Bz356181 Transient</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_TransientImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_Transient()
+     * @generated
+     */
+    EClass BZ356181_TRANSIENT = eINSTANCE.getBz356181_Transient();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl <em>Bz356181 Non Transient</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz356181_NonTransientImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz356181_NonTransient()
+     * @generated
+     */
+    EClass BZ356181_NON_TRANSIENT = eINSTANCE.getBz356181_NonTransient();
+
+    /**
+     * The meta object literal for the '<em><b>Main</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ356181_NON_TRANSIENT__MAIN = eINSTANCE.getBz356181_NonTransient_Main();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl <em>Bz387752 Main</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz387752_MainImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Main()
+     * @generated
+     */
+    EClass BZ387752_MAIN = eINSTANCE.getBz387752_Main();
+
+    /**
+     * The meta object literal for the '<em><b>Str Unsettable</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ387752_MAIN__STR_UNSETTABLE = eINSTANCE.getBz387752_Main_StrUnsettable();
+
+    /**
+     * The meta object literal for the '<em><b>Str Settable</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ387752_MAIN__STR_SETTABLE = eINSTANCE.getBz387752_Main_StrSettable();
+
+    /**
+     * The meta object literal for the '<em><b>Enum Settable</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ387752_MAIN__ENUM_SETTABLE = eINSTANCE.getBz387752_Main_EnumSettable();
+
+    /**
+     * The meta object literal for the '<em><b>Enum Unsettable</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ387752_MAIN__ENUM_UNSETTABLE = eINSTANCE.getBz387752_Main_EnumUnsettable();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl <em>Bz380987 Group</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_GroupImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Group()
+     * @generated
+     */
+    EClass BZ380987_GROUP = eINSTANCE.getBz380987_Group();
+
+    /**
+     * The meta object literal for the '<em><b>People</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ380987_GROUP__PEOPLE = eINSTANCE.getBz380987_Group_People();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl <em>Bz380987 Place</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PlaceImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Place()
+     * @generated
+     */
+    EClass BZ380987_PLACE = eINSTANCE.getBz380987_Place();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ380987_PLACE__NAME = eINSTANCE.getBz380987_Place_Name();
+
+    /**
+     * The meta object literal for the '<em><b>People</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ380987_PLACE__PEOPLE = eINSTANCE.getBz380987_Place_People();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl <em>Bz380987 Person</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz380987_PersonImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz380987_Person()
+     * @generated
+     */
+    EClass BZ380987_PERSON = eINSTANCE.getBz380987_Person();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ380987_PERSON__NAME = eINSTANCE.getBz380987_Person_Name();
+
+    /**
+     * The meta object literal for the '<em><b>Group</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ380987_PERSON__GROUP = eINSTANCE.getBz380987_Person_Group();
+
+    /**
+     * The meta object literal for the '<em><b>Places</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ380987_PERSON__PLACES = eINSTANCE.getBz380987_Person_Places();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl <em>Bz398057 A</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A()
+     * @generated
+     */
+    EClass BZ398057_A = eINSTANCE.getBz398057A();
+
+    /**
+     * The meta object literal for the '<em><b>List Of B</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ398057_A__LIST_OF_B = eINSTANCE.getBz398057A_ListOfB();
+
+    /**
+     * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ398057_A__DB_ID = eINSTANCE.getBz398057A_DbId();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A1()
+     * @generated
+     */
+    EClass BZ398057_A1 = eINSTANCE.getBz398057A1();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl <em>Bz398057 B</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B()
+     * @generated
+     */
+    EClass BZ398057_B = eINSTANCE.getBz398057B();
+
+    /**
+     * The meta object literal for the '<em><b>Ref To Class A</b></em>' container reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ398057_B__REF_TO_CLASS_A = eINSTANCE.getBz398057B_RefToClassA();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ398057_B__VALUE = eINSTANCE.getBz398057B_Value();
+
+    /**
+     * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ398057_B__DB_ID = eINSTANCE.getBz398057B_DbId();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B1()
+     * @generated
+     */
+    EClass BZ398057_B1 = eINSTANCE.getBz398057B1();
+
+    /**
+     * The meta object literal for the '<em><b>Value Str</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ398057_B1__VALUE_STR = eINSTANCE.getBz398057B1_ValueStr();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl <em>Bz397682 P</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682P()
+     * @generated
+     */
+    EClass BZ397682_P = eINSTANCE.getBz397682P();
+
+    /**
+     * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ397682_P__DB_ID = eINSTANCE.getBz397682P_DbId();
+
+    /**
+     * The meta object literal for the '<em><b>List Of C</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ397682_P__LIST_OF_C = eINSTANCE.getBz397682P_ListOfC();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl <em>Bz397682 C</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682C()
+     * @generated
+     */
+    EClass BZ397682_C = eINSTANCE.getBz397682C();
+
+    /**
+     * The meta object literal for the '<em><b>Ref To P</b></em>' container reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ397682_C__REF_TO_P = eINSTANCE.getBz397682C_RefToP();
+
+    /**
+     * The meta object literal for the '<em><b>Ref To C</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference BZ397682_C__REF_TO_C = eINSTANCE.getBz397682C_RefToC();
+
+    /**
+     * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BZ397682_C__DB_ID = eINSTANCE.getBz397682C_DbId();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}' enum.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum
+     * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Enum()
+     * @generated
+     */
+    EEnum BZ387752_ENUM = eINSTANCE.getBz387752_Enum();
+
+  }
+
+} // HibernateTestPackage
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
index 3e2393cbb7..00aee21d99 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
@@ -37,310 +37,345 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  *
  * @generated
  */
-public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main {
-	/**
-	 * The default value of the '{@link #getTransient() <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TRANSIENT_EDEFAULT = null;
+public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
+{
+  /**
+   * The default value of the '{@link #getTransient() <em>Transient</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getTransient()
+   * @generated
+   * @ordered
+   */
+  protected static final String TRANSIENT_EDEFAULT = null;
 
-	/**
-	 * The cached value of the '{@link #getTransient() <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected String transient_ = TRANSIENT_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getTransient() <em>Transient</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getTransient()
+   * @generated
+   * @ordered
+   */
+  protected String transient_ = TRANSIENT_EDEFAULT;
 
-	/**
-	 * The default value of the '{@link #getNonTransient() <em>Non Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNonTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NON_TRANSIENT_EDEFAULT = null;
+  /**
+   * The default value of the '{@link #getNonTransient() <em>Non Transient</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getNonTransient()
+   * @generated
+   * @ordered
+   */
+  protected static final String NON_TRANSIENT_EDEFAULT = null;
 
-	/**
-	 * The cached value of the '{@link #getNonTransient() <em>Non Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNonTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected String nonTransient = NON_TRANSIENT_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getNonTransient() <em>Non Transient</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getNonTransient()
+   * @generated
+   * @ordered
+   */
+  protected String nonTransient = NON_TRANSIENT_EDEFAULT;
 
-	/**
-	 * The cached value of the '{@link #getTransientRef() <em>Transient Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransientRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected Bz356181_Transient transientRef;
+  /**
+   * The cached value of the '{@link #getTransientRef() <em>Transient Ref</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getTransientRef()
+   * @generated
+   * @ordered
+   */
+  protected Bz356181_Transient transientRef;
 
-	/**
-	 * The cached value of the '{@link #getTransientOtherRef() <em>Transient Other Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransientOtherRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected Bz356181_NonTransient transientOtherRef;
+  /**
+   * The cached value of the '{@link #getTransientOtherRef() <em>Transient Other Ref</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getTransientOtherRef()
+   * @generated
+   * @ordered
+   */
+  protected Bz356181_NonTransient transientOtherRef;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz356181_MainImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz356181_MainImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ356181_MAIN;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ356181_MAIN;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTransient() {
-		return transient_;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getTransient()
+  {
+    return transient_;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransient(String newTransient) {
-		String oldTransient = transient_;
-		transient_ = newTransient;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT, oldTransient, transient_));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setTransient(String newTransient)
+  {
+    String oldTransient = transient_;
+    transient_ = newTransient;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT,
+          oldTransient, transient_));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNonTransient() {
-		return nonTransient;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getNonTransient()
+  {
+    return nonTransient;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNonTransient(String newNonTransient) {
-		String oldNonTransient = nonTransient;
-		nonTransient = newNonTransient;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT, oldNonTransient, nonTransient));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setNonTransient(String newNonTransient)
+  {
+    String oldNonTransient = nonTransient;
+    nonTransient = newNonTransient;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT,
+          oldNonTransient, nonTransient));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_Transient getTransientRef() {
-		if (transientRef != null && transientRef.eIsProxy()) {
-			InternalEObject oldTransientRef = (InternalEObject)transientRef;
-			transientRef = (Bz356181_Transient)eResolveProxy(oldTransientRef);
-			if (transientRef != oldTransientRef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF, oldTransientRef, transientRef));
-			}
-		}
-		return transientRef;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_Transient getTransientRef()
+  {
+    if (transientRef != null && transientRef.eIsProxy())
+    {
+      InternalEObject oldTransientRef = (InternalEObject)transientRef;
+      transientRef = (Bz356181_Transient)eResolveProxy(oldTransientRef);
+      if (transientRef != oldTransientRef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
+              oldTransientRef, transientRef));
+      }
+    }
+    return transientRef;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_Transient basicGetTransientRef() {
-		return transientRef;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_Transient basicGetTransientRef()
+  {
+    return transientRef;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransientRef(Bz356181_Transient newTransientRef) {
-		Bz356181_Transient oldTransientRef = transientRef;
-		transientRef = newTransientRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF, oldTransientRef, transientRef));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setTransientRef(Bz356181_Transient newTransientRef)
+  {
+    Bz356181_Transient oldTransientRef = transientRef;
+    transientRef = newTransientRef;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
+          oldTransientRef, transientRef));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_NonTransient getTransientOtherRef() {
-		if (transientOtherRef != null && transientOtherRef.eIsProxy()) {
-			InternalEObject oldTransientOtherRef = (InternalEObject)transientOtherRef;
-			transientOtherRef = (Bz356181_NonTransient)eResolveProxy(oldTransientOtherRef);
-			if (transientOtherRef != oldTransientOtherRef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
-			}
-		}
-		return transientOtherRef;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_NonTransient getTransientOtherRef()
+  {
+    if (transientOtherRef != null && transientOtherRef.eIsProxy())
+    {
+      InternalEObject oldTransientOtherRef = (InternalEObject)transientOtherRef;
+      transientOtherRef = (Bz356181_NonTransient)eResolveProxy(oldTransientOtherRef);
+      if (transientOtherRef != oldTransientOtherRef)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
+      }
+    }
+    return transientOtherRef;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_NonTransient basicGetTransientOtherRef() {
-		return transientOtherRef;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_NonTransient basicGetTransientOtherRef()
+  {
+    return transientOtherRef;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransientOtherRef(Bz356181_NonTransient newTransientOtherRef) {
-		Bz356181_NonTransient oldTransientOtherRef = transientOtherRef;
-		transientOtherRef = newTransientOtherRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setTransientOtherRef(Bz356181_NonTransient newTransientOtherRef)
+  {
+    Bz356181_NonTransient oldTransientOtherRef = transientOtherRef;
+    transientOtherRef = newTransientOtherRef;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF,
+          oldTransientOtherRef, transientOtherRef));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
-				return getTransient();
-			case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
-				return getNonTransient();
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
-				if (resolve) return getTransientRef();
-				return basicGetTransientRef();
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
-				if (resolve) return getTransientOtherRef();
-				return basicGetTransientOtherRef();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
+      return getTransient();
+    case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
+      return getNonTransient();
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
+      if (resolve)
+        return getTransientRef();
+      return basicGetTransientRef();
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
+      if (resolve)
+        return getTransientOtherRef();
+      return basicGetTransientOtherRef();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
-				setTransient((String)newValue);
-				return;
-			case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
-				setNonTransient((String)newValue);
-				return;
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
-				setTransientRef((Bz356181_Transient)newValue);
-				return;
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
-				setTransientOtherRef((Bz356181_NonTransient)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
+      setTransient((String)newValue);
+      return;
+    case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
+      setNonTransient((String)newValue);
+      return;
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
+      setTransientRef((Bz356181_Transient)newValue);
+      return;
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
+      setTransientOtherRef((Bz356181_NonTransient)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
-				setNonTransient(NON_TRANSIENT_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
-				setTransientRef((Bz356181_Transient)null);
-				return;
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
-				setTransientOtherRef((Bz356181_NonTransient)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
+      setTransient(TRANSIENT_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
+      setNonTransient(NON_TRANSIENT_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
+      setTransientRef((Bz356181_Transient)null);
+      return;
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
+      setTransientOtherRef((Bz356181_NonTransient)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
-				return TRANSIENT_EDEFAULT == null ? transient_ != null : !TRANSIENT_EDEFAULT.equals(transient_);
-			case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
-				return NON_TRANSIENT_EDEFAULT == null ? nonTransient != null : !NON_TRANSIENT_EDEFAULT.equals(nonTransient);
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
-				return transientRef != null;
-			case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
-				return transientOtherRef != null;
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT:
+      return TRANSIENT_EDEFAULT == null ? transient_ != null : !TRANSIENT_EDEFAULT.equals(transient_);
+    case HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT:
+      return NON_TRANSIENT_EDEFAULT == null ? nonTransient != null : !NON_TRANSIENT_EDEFAULT.equals(nonTransient);
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
+      return transientRef != null;
+    case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
+      return transientOtherRef != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (transient: ");
-		result.append(transient_);
-		result.append(", nonTransient: ");
-		result.append(nonTransient);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (transient: ");
+    result.append(transient_);
+    result.append(", nonTransient: ");
+    result.append(nonTransient);
+    result.append(')');
+    return result.toString();
+  }
 
-} //Bz356181_MainImpl
+} // Bz356181_MainImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
index eb60e03aa5..25675de208 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
@@ -33,131 +33,150 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  *
  * @generated
  */
-public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_NonTransient {
-	/**
-	 * The cached value of the '{@link #getMain() <em>Main</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMain()
-	 * @generated
-	 * @ordered
-	 */
-	protected Bz356181_Main main;
+public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_NonTransient
+{
+  /**
+   * The cached value of the '{@link #getMain() <em>Main</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getMain()
+   * @generated
+   * @ordered
+   */
+  protected Bz356181_Main main;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz356181_NonTransientImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz356181_NonTransientImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ356181_NON_TRANSIENT;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ356181_NON_TRANSIENT;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_Main getMain() {
-		if (main != null && main.eIsProxy()) {
-			InternalEObject oldMain = (InternalEObject)main;
-			main = (Bz356181_Main)eResolveProxy(oldMain);
-			if (main != oldMain) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain, main));
-			}
-		}
-		return main;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_Main getMain()
+  {
+    if (main != null && main.eIsProxy())
+    {
+      InternalEObject oldMain = (InternalEObject)main;
+      main = (Bz356181_Main)eResolveProxy(oldMain);
+      if (main != oldMain)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN,
+              oldMain, main));
+      }
+    }
+    return main;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_Main basicGetMain() {
-		return main;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_Main basicGetMain()
+  {
+    return main;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMain(Bz356181_Main newMain) {
-		Bz356181_Main oldMain = main;
-		main = newMain;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain, main));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setMain(Bz356181_Main newMain)
+  {
+    Bz356181_Main oldMain = main;
+    main = newMain;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain,
+          main));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
-				if (resolve) return getMain();
-				return basicGetMain();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
+      if (resolve)
+        return getMain();
+      return basicGetMain();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
-				setMain((Bz356181_Main)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
+      setMain((Bz356181_Main)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
-				setMain((Bz356181_Main)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
+      setMain((Bz356181_Main)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
-				return main != null;
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
+      return main != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
-} //Bz356181_NonTransientImpl
+} // Bz356181_NonTransientImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_TransientImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_TransientImpl.java
index e524d76e03..188b920484 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_TransientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_TransientImpl.java
@@ -25,24 +25,27 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  *
  * @generated
  */
-public class Bz356181_TransientImpl extends EObjectImpl implements Bz356181_Transient {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz356181_TransientImpl() {
-		super();
-	}
+public class Bz356181_TransientImpl extends EObjectImpl implements Bz356181_Transient
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz356181_TransientImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ356181_TRANSIENT;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ356181_TRANSIENT;
+  }
 
-} //Bz356181_TransientImpl
+} // Bz356181_TransientImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java
index 1ff1407140..46b859e5e9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_GroupImpl.java
@@ -37,135 +37,153 @@ import java.util.Collection;
  *
  * @generated
  */
-public class Bz380987_GroupImpl extends EObjectImpl implements Bz380987_Group {
-	/**
-	 * The cached value of the '{@link #getPeople() <em>People</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPeople()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Bz380987_Person> people;
+public class Bz380987_GroupImpl extends EObjectImpl implements Bz380987_Group
+{
+  /**
+   * The cached value of the '{@link #getPeople() <em>People</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getPeople()
+   * @generated
+   * @ordered
+   */
+  protected EList<Bz380987_Person> people;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz380987_GroupImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz380987_GroupImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ380987_GROUP;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ380987_GROUP;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Bz380987_Person> getPeople() {
-		if (people == null) {
-			people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this, HibernateTestPackage.BZ380987_GROUP__PEOPLE, HibernateTestPackage.BZ380987_PERSON__GROUP);
-		}
-		return people;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Bz380987_Person> getPeople()
+  {
+    if (people == null)
+    {
+      people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this,
+          HibernateTestPackage.BZ380987_GROUP__PEOPLE, HibernateTestPackage.BZ380987_PERSON__GROUP);
+    }
+    return people;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getPeople()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getPeople()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
-				return ((InternalEList<?>)getPeople()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
+      return ((InternalEList<?>)getPeople()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
-				return getPeople();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
+      return getPeople();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
-				getPeople().clear();
-				getPeople().addAll((Collection<? extends Bz380987_Person>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
+      getPeople().clear();
+      getPeople().addAll((Collection<? extends Bz380987_Person>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
-				getPeople().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
+      getPeople().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
-				return people != null && !people.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_GROUP__PEOPLE:
+      return people != null && !people.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
 
-} //Bz380987_GroupImpl
+} // Bz380987_GroupImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
index 0527784545..34cbb9acba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
@@ -42,239 +42,264 @@ import java.util.Collection;
  *
  * @generated
  */
-public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person {
-	/**
-	 * 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;
+public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
+{
+  /**
+   * 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 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 cached value of the '{@link #getGroup() <em>Group</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGroup()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Bz380987_Group> group;
+  /**
+   * The cached value of the '{@link #getGroup() <em>Group</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getGroup()
+   * @generated
+   * @ordered
+   */
+  protected EList<Bz380987_Group> group;
 
-	/**
-	 * The cached value of the '{@link #getPlaces() <em>Places</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlaces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Bz380987_Place> places;
+  /**
+   * The cached value of the '{@link #getPlaces() <em>Places</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getPlaces()
+   * @generated
+   * @ordered
+   */
+  protected EList<Bz380987_Place> places;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz380987_PersonImpl() {
-		super();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz380987_PersonImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ380987_PERSON;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ380987_PERSON;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+  /**
+   * <!-- 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, HibernateTestPackage.BZ380987_PERSON__NAME, oldName, 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, HibernateTestPackage.BZ380987_PERSON__NAME, oldName, name));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Bz380987_Group> getGroup() {
-		if (group == null) {
-			group = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Group>(Bz380987_Group.class, this, HibernateTestPackage.BZ380987_PERSON__GROUP, HibernateTestPackage.BZ380987_GROUP__PEOPLE);
-		}
-		return group;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Bz380987_Group> getGroup()
+  {
+    if (group == null)
+    {
+      group = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Group>(Bz380987_Group.class, this,
+          HibernateTestPackage.BZ380987_PERSON__GROUP, HibernateTestPackage.BZ380987_GROUP__PEOPLE);
+    }
+    return group;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Bz380987_Place> getPlaces() {
-		if (places == null) {
-			places = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Place>(Bz380987_Place.class, this, HibernateTestPackage.BZ380987_PERSON__PLACES, HibernateTestPackage.BZ380987_PLACE__PEOPLE);
-		}
-		return places;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Bz380987_Place> getPlaces()
+  {
+    if (places == null)
+    {
+      places = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Place>(Bz380987_Place.class, this,
+          HibernateTestPackage.BZ380987_PERSON__PLACES, HibernateTestPackage.BZ380987_PLACE__PEOPLE);
+    }
+    return places;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PERSON__GROUP:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getGroup()).basicAdd(otherEnd, msgs);
-			case HibernateTestPackage.BZ380987_PERSON__PLACES:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getPlaces()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PERSON__GROUP:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getGroup()).basicAdd(otherEnd, msgs);
+    case HibernateTestPackage.BZ380987_PERSON__PLACES:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getPlaces()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PERSON__GROUP:
-				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
-			case HibernateTestPackage.BZ380987_PERSON__PLACES:
-				return ((InternalEList<?>)getPlaces()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PERSON__GROUP:
+      return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
+    case HibernateTestPackage.BZ380987_PERSON__PLACES:
+      return ((InternalEList<?>)getPlaces()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PERSON__NAME:
-				return getName();
-			case HibernateTestPackage.BZ380987_PERSON__GROUP:
-				return getGroup();
-			case HibernateTestPackage.BZ380987_PERSON__PLACES:
-				return getPlaces();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PERSON__NAME:
+      return getName();
+    case HibernateTestPackage.BZ380987_PERSON__GROUP:
+      return getGroup();
+    case HibernateTestPackage.BZ380987_PERSON__PLACES:
+      return getPlaces();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PERSON__NAME:
-				setName((String)newValue);
-				return;
-			case HibernateTestPackage.BZ380987_PERSON__GROUP:
-				getGroup().clear();
-				getGroup().addAll((Collection<? extends Bz380987_Group>)newValue);
-				return;
-			case HibernateTestPackage.BZ380987_PERSON__PLACES:
-				getPlaces().clear();
-				getPlaces().addAll((Collection<? extends Bz380987_Place>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PERSON__NAME:
+      setName((String)newValue);
+      return;
+    case HibernateTestPackage.BZ380987_PERSON__GROUP:
+      getGroup().clear();
+      getGroup().addAll((Collection<? extends Bz380987_Group>)newValue);
+      return;
+    case HibernateTestPackage.BZ380987_PERSON__PLACES:
+      getPlaces().clear();
+      getPlaces().addAll((Collection<? extends Bz380987_Place>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PERSON__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ380987_PERSON__GROUP:
-				getGroup().clear();
-				return;
-			case HibernateTestPackage.BZ380987_PERSON__PLACES:
-				getPlaces().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PERSON__NAME:
+      setName(NAME_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ380987_PERSON__GROUP:
+      getGroup().clear();
+      return;
+    case HibernateTestPackage.BZ380987_PERSON__PLACES:
+      getPlaces().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PERSON__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HibernateTestPackage.BZ380987_PERSON__GROUP:
-				return group != null && !group.isEmpty();
-			case HibernateTestPackage.BZ380987_PERSON__PLACES:
-				return places != null && !places.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PERSON__NAME:
+      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    case HibernateTestPackage.BZ380987_PERSON__GROUP:
+      return group != null && !group.isEmpty();
+    case HibernateTestPackage.BZ380987_PERSON__PLACES:
+      return places != null && !places.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
 
-} //Bz380987_PersonImpl
+} // Bz380987_PersonImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
index 8a1d7a9905..247ae2262e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
@@ -40,202 +40,224 @@ import java.util.Collection;
  *
  * @generated
  */
-public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place {
-	/**
-	 * 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 cached value of the '{@link #getPeople() <em>People</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPeople()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Bz380987_Person> people;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz380987_PlaceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ380987_PLACE;
-	}
-
-	/**
-	 * <!-- 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, HibernateTestPackage.BZ380987_PLACE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Bz380987_Person> getPeople() {
-		if (people == null) {
-			people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this, HibernateTestPackage.BZ380987_PLACE__PEOPLE, HibernateTestPackage.BZ380987_PERSON__PLACES);
-		}
-		return people;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getPeople()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
-				return ((InternalEList<?>)getPeople()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PLACE__NAME:
-				return getName();
-			case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
-				return getPeople();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PLACE__NAME:
-				setName((String)newValue);
-				return;
-			case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
-				getPeople().clear();
-				getPeople().addAll((Collection<? extends Bz380987_Person>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PLACE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
-				getPeople().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ380987_PLACE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
-				return people != null && !people.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //Bz380987_PlaceImpl
+public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place
+{
+  /**
+   * 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 cached value of the '{@link #getPeople() <em>People</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getPeople()
+   * @generated
+   * @ordered
+   */
+  protected EList<Bz380987_Person> people;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz380987_PlaceImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ380987_PLACE;
+  }
+
+  /**
+   * <!-- 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, HibernateTestPackage.BZ380987_PLACE__NAME, oldName, name));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Bz380987_Person> getPeople()
+  {
+    if (people == null)
+    {
+      people = new EObjectWithInverseResolvingEList.ManyInverse<Bz380987_Person>(Bz380987_Person.class, this,
+          HibernateTestPackage.BZ380987_PLACE__PEOPLE, HibernateTestPackage.BZ380987_PERSON__PLACES);
+    }
+    return people;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getPeople()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
+      return ((InternalEList<?>)getPeople()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PLACE__NAME:
+      return getName();
+    case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
+      return getPeople();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PLACE__NAME:
+      setName((String)newValue);
+      return;
+    case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
+      getPeople().clear();
+      getPeople().addAll((Collection<? extends Bz380987_Person>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PLACE__NAME:
+      setName(NAME_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
+      getPeople().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ380987_PLACE__NAME:
+      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    case HibernateTestPackage.BZ380987_PLACE__PEOPLE:
+      return people != null && !people.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz380987_PlaceImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
index a2c03928b9..c2c1935ab1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
@@ -35,366 +35,403 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  *
  * @generated
  */
-public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main {
-	/**
-	 * The default value of the '{@link #getStrUnsettable() <em>Str Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStrUnsettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String STR_UNSETTABLE_EDEFAULT = "def_value";
-
-	/**
-	 * The cached value of the '{@link #getStrUnsettable() <em>Str Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStrUnsettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected String strUnsettable = STR_UNSETTABLE_EDEFAULT;
-
-	/**
-	 * This is true if the Str Unsettable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean strUnsettableESet;
-
-	/**
-	 * The default value of the '{@link #getStrSettable() <em>Str Settable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStrSettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String STR_SETTABLE_EDEFAULT = "value";
-
-	/**
-	 * The cached value of the '{@link #getStrSettable() <em>Str Settable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStrSettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected String strSettable = STR_SETTABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEnumSettable() <em>Enum Settable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnumSettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Bz387752_Enum ENUM_SETTABLE_EDEFAULT = Bz387752_Enum.VAL0;
-
-	/**
-	 * The cached value of the '{@link #getEnumSettable() <em>Enum Settable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnumSettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Bz387752_Enum enumSettable = ENUM_SETTABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEnumUnsettable() <em>Enum Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnumUnsettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Bz387752_Enum ENUM_UNSETTABLE_EDEFAULT = Bz387752_Enum.VAL1;
-
-	/**
-	 * The cached value of the '{@link #getEnumUnsettable() <em>Enum Unsettable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnumUnsettable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Bz387752_Enum enumUnsettable = ENUM_UNSETTABLE_EDEFAULT;
-
-	/**
-	 * This is true if the Enum Unsettable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean enumUnsettableESet;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz387752_MainImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ387752_MAIN;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getStrUnsettable() {
-		return strUnsettable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStrUnsettable(String newStrUnsettable) {
-		String oldStrUnsettable = strUnsettable;
-		strUnsettable = newStrUnsettable;
-		boolean oldStrUnsettableESet = strUnsettableESet;
-		strUnsettableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE, oldStrUnsettable, strUnsettable, !oldStrUnsettableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetStrUnsettable() {
-		String oldStrUnsettable = strUnsettable;
-		boolean oldStrUnsettableESet = strUnsettableESet;
-		strUnsettable = STR_UNSETTABLE_EDEFAULT;
-		strUnsettableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE, oldStrUnsettable, STR_UNSETTABLE_EDEFAULT, oldStrUnsettableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetStrUnsettable() {
-		return strUnsettableESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getStrSettable() {
-		return strSettable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStrSettable(String newStrSettable) {
-		String oldStrSettable = strSettable;
-		strSettable = newStrSettable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE, oldStrSettable, strSettable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz387752_Enum getEnumSettable() {
-		return enumSettable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnumSettable(Bz387752_Enum newEnumSettable) {
-		Bz387752_Enum oldEnumSettable = enumSettable;
-		enumSettable = newEnumSettable == null ? ENUM_SETTABLE_EDEFAULT : newEnumSettable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE, oldEnumSettable, enumSettable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz387752_Enum getEnumUnsettable() {
-		return enumUnsettable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnumUnsettable(Bz387752_Enum newEnumUnsettable) {
-		Bz387752_Enum oldEnumUnsettable = enumUnsettable;
-		enumUnsettable = newEnumUnsettable == null ? ENUM_UNSETTABLE_EDEFAULT : newEnumUnsettable;
-		boolean oldEnumUnsettableESet = enumUnsettableESet;
-		enumUnsettableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE, oldEnumUnsettable, enumUnsettable, !oldEnumUnsettableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetEnumUnsettable() {
-		Bz387752_Enum oldEnumUnsettable = enumUnsettable;
-		boolean oldEnumUnsettableESet = enumUnsettableESet;
-		enumUnsettable = ENUM_UNSETTABLE_EDEFAULT;
-		enumUnsettableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE, oldEnumUnsettable, ENUM_UNSETTABLE_EDEFAULT, oldEnumUnsettableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetEnumUnsettable() {
-		return enumUnsettableESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
-				return getStrUnsettable();
-			case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
-				return getStrSettable();
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
-				return getEnumSettable();
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
-				return getEnumUnsettable();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
-				setStrUnsettable((String)newValue);
-				return;
-			case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
-				setStrSettable((String)newValue);
-				return;
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
-				setEnumSettable((Bz387752_Enum)newValue);
-				return;
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
-				setEnumUnsettable((Bz387752_Enum)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
-				unsetStrUnsettable();
-				return;
-			case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
-				setStrSettable(STR_SETTABLE_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
-				setEnumSettable(ENUM_SETTABLE_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
-				unsetEnumUnsettable();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
-				return isSetStrUnsettable();
-			case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
-				return STR_SETTABLE_EDEFAULT == null ? strSettable != null : !STR_SETTABLE_EDEFAULT.equals(strSettable);
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
-				return enumSettable != ENUM_SETTABLE_EDEFAULT;
-			case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
-				return isSetEnumUnsettable();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (strUnsettable: ");
-		if (strUnsettableESet) result.append(strUnsettable); else result.append("<unset>");
-		result.append(", strSettable: ");
-		result.append(strSettable);
-		result.append(", enumSettable: ");
-		result.append(enumSettable);
-		result.append(", enumUnsettable: ");
-		if (enumUnsettableESet) result.append(enumUnsettable); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //Bz387752_MainImpl
+public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
+{
+  /**
+   * The default value of the '{@link #getStrUnsettable() <em>Str Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getStrUnsettable()
+   * @generated
+   * @ordered
+   */
+  protected static final String STR_UNSETTABLE_EDEFAULT = "def_value";
+
+  /**
+   * The cached value of the '{@link #getStrUnsettable() <em>Str Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getStrUnsettable()
+   * @generated
+   * @ordered
+   */
+  protected String strUnsettable = STR_UNSETTABLE_EDEFAULT;
+
+  /**
+   * This is true if the Str Unsettable attribute has been set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  protected boolean strUnsettableESet;
+
+  /**
+   * The default value of the '{@link #getStrSettable() <em>Str Settable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getStrSettable()
+   * @generated
+   * @ordered
+   */
+  protected static final String STR_SETTABLE_EDEFAULT = "value";
+
+  /**
+   * The cached value of the '{@link #getStrSettable() <em>Str Settable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getStrSettable()
+   * @generated
+   * @ordered
+   */
+  protected String strSettable = STR_SETTABLE_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getEnumSettable() <em>Enum Settable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getEnumSettable()
+   * @generated
+   * @ordered
+   */
+  protected static final Bz387752_Enum ENUM_SETTABLE_EDEFAULT = Bz387752_Enum.VAL0;
+
+  /**
+   * The cached value of the '{@link #getEnumSettable() <em>Enum Settable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getEnumSettable()
+   * @generated
+   * @ordered
+   */
+  protected Bz387752_Enum enumSettable = ENUM_SETTABLE_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getEnumUnsettable() <em>Enum Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getEnumUnsettable()
+   * @generated
+   * @ordered
+   */
+  protected static final Bz387752_Enum ENUM_UNSETTABLE_EDEFAULT = Bz387752_Enum.VAL1;
+
+  /**
+   * The cached value of the '{@link #getEnumUnsettable() <em>Enum Unsettable</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getEnumUnsettable()
+   * @generated
+   * @ordered
+   */
+  protected Bz387752_Enum enumUnsettable = ENUM_UNSETTABLE_EDEFAULT;
+
+  /**
+   * This is true if the Enum Unsettable attribute has been set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  protected boolean enumUnsettableESet;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz387752_MainImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ387752_MAIN;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getStrUnsettable()
+  {
+    return strUnsettable;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setStrUnsettable(String newStrUnsettable)
+  {
+    String oldStrUnsettable = strUnsettable;
+    strUnsettable = newStrUnsettable;
+    boolean oldStrUnsettableESet = strUnsettableESet;
+    strUnsettableESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
+          oldStrUnsettable, strUnsettable, !oldStrUnsettableESet));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void unsetStrUnsettable()
+  {
+    String oldStrUnsettable = strUnsettable;
+    boolean oldStrUnsettableESet = strUnsettableESet;
+    strUnsettable = STR_UNSETTABLE_EDEFAULT;
+    strUnsettableESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
+          oldStrUnsettable, STR_UNSETTABLE_EDEFAULT, oldStrUnsettableESet));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean isSetStrUnsettable()
+  {
+    return strUnsettableESet;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getStrSettable()
+  {
+    return strSettable;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setStrSettable(String newStrSettable)
+  {
+    String oldStrSettable = strSettable;
+    strSettable = newStrSettable;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE,
+          oldStrSettable, strSettable));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz387752_Enum getEnumSettable()
+  {
+    return enumSettable;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setEnumSettable(Bz387752_Enum newEnumSettable)
+  {
+    Bz387752_Enum oldEnumSettable = enumSettable;
+    enumSettable = newEnumSettable == null ? ENUM_SETTABLE_EDEFAULT : newEnumSettable;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE,
+          oldEnumSettable, enumSettable));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz387752_Enum getEnumUnsettable()
+  {
+    return enumUnsettable;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setEnumUnsettable(Bz387752_Enum newEnumUnsettable)
+  {
+    Bz387752_Enum oldEnumUnsettable = enumUnsettable;
+    enumUnsettable = newEnumUnsettable == null ? ENUM_UNSETTABLE_EDEFAULT : newEnumUnsettable;
+    boolean oldEnumUnsettableESet = enumUnsettableESet;
+    enumUnsettableESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
+          oldEnumUnsettable, enumUnsettable, !oldEnumUnsettableESet));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void unsetEnumUnsettable()
+  {
+    Bz387752_Enum oldEnumUnsettable = enumUnsettable;
+    boolean oldEnumUnsettableESet = enumUnsettableESet;
+    enumUnsettable = ENUM_UNSETTABLE_EDEFAULT;
+    enumUnsettableESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
+          oldEnumUnsettable, ENUM_UNSETTABLE_EDEFAULT, oldEnumUnsettableESet));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean isSetEnumUnsettable()
+  {
+    return enumUnsettableESet;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
+      return getStrUnsettable();
+    case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
+      return getStrSettable();
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
+      return getEnumSettable();
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
+      return getEnumUnsettable();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
+      setStrUnsettable((String)newValue);
+      return;
+    case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
+      setStrSettable((String)newValue);
+      return;
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
+      setEnumSettable((Bz387752_Enum)newValue);
+      return;
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
+      setEnumUnsettable((Bz387752_Enum)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
+      unsetStrUnsettable();
+      return;
+    case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
+      setStrSettable(STR_SETTABLE_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
+      setEnumSettable(ENUM_SETTABLE_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
+      unsetEnumUnsettable();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE:
+      return isSetStrUnsettable();
+    case HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE:
+      return STR_SETTABLE_EDEFAULT == null ? strSettable != null : !STR_SETTABLE_EDEFAULT.equals(strSettable);
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE:
+      return enumSettable != ENUM_SETTABLE_EDEFAULT;
+    case HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE:
+      return isSetEnumUnsettable();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (strUnsettable: ");
+    if (strUnsettableESet)
+      result.append(strUnsettable);
+    else
+      result.append("<unset>");
+    result.append(", strSettable: ");
+    result.append(strSettable);
+    result.append(", enumSettable: ");
+    result.append(enumSettable);
+    result.append(", enumUnsettable: ");
+    if (enumUnsettableESet)
+      result.append(enumUnsettable);
+    else
+      result.append("<unset>");
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz387752_MainImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
index 5a8a56cd8c..35cd4b24ab 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
@@ -37,292 +37,332 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *
  * @generated
  */
-public class Bz397682CImpl extends EObjectImpl implements Bz397682C {
-	/**
-	 * The cached value of the '{@link #getRefToC() <em>Ref To C</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefToC()
-	 * @generated
-	 * @ordered
-	 */
-	protected Bz397682C refToC;
+public class Bz397682CImpl extends EObjectImpl implements Bz397682C
+{
+  /**
+   * The cached value of the '{@link #getRefToC() <em>Ref To C</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getRefToC()
+   * @generated
+   * @ordered
+   */
+  protected Bz397682C refToC;
 
-	/**
-	 * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DB_ID_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dbId = DB_ID_EDEFAULT;
+  /**
+   * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected static final String DB_ID_EDEFAULT = null;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz397682CImpl() {
-		super();
-	}
+  /**
+   * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected String dbId = DB_ID_EDEFAULT;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ397682_C;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz397682CImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz397682P getRefToP() {
-		if (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P) return null;
-		return (Bz397682P)eContainer();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ397682_C;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRefToP(Bz397682P newRefToP, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRefToP, HibernateTestPackage.BZ397682_C__REF_TO_P, msgs);
-		return msgs;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz397682P getRefToP()
+  {
+    if (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P)
+      return null;
+    return (Bz397682P)eContainer();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRefToP(Bz397682P newRefToP) {
-		if (newRefToP != eInternalContainer() || (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null)) {
-			if (EcoreUtil.isAncestor(this, newRefToP))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRefToP != null)
-				msgs = ((InternalEObject)newRefToP).eInverseAdd(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class, msgs);
-			msgs = basicSetRefToP(newRefToP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_P, newRefToP, newRefToP));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetRefToP(Bz397682P newRefToP, NotificationChain msgs)
+  {
+    msgs = eBasicSetContainer((InternalEObject)newRefToP, HibernateTestPackage.BZ397682_C__REF_TO_P, msgs);
+    return msgs;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz397682C getRefToC() {
-		if (refToC != null && refToC.eIsProxy()) {
-			InternalEObject oldRefToC = (InternalEObject)refToC;
-			refToC = (Bz397682C)eResolveProxy(oldRefToC);
-			if (refToC != oldRefToC) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
-			}
-		}
-		return refToC;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setRefToP(Bz397682P newRefToP)
+  {
+    if (newRefToP != eInternalContainer()
+        || (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null))
+    {
+      if (EcoreUtil.isAncestor(this, newRefToP))
+        throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      NotificationChain msgs = null;
+      if (eInternalContainer() != null)
+        msgs = eBasicRemoveFromContainer(msgs);
+      if (newRefToP != null)
+        msgs = ((InternalEObject)newRefToP).eInverseAdd(this, HibernateTestPackage.BZ397682_P__LIST_OF_C,
+            Bz397682P.class, msgs);
+      msgs = basicSetRefToP(newRefToP, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_P, newRefToP,
+          newRefToP));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz397682C basicGetRefToC() {
-		return refToC;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz397682C getRefToC()
+  {
+    if (refToC != null && refToC.eIsProxy())
+    {
+      InternalEObject oldRefToC = (InternalEObject)refToC;
+      refToC = (Bz397682C)eResolveProxy(oldRefToC);
+      if (refToC != oldRefToC)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C,
+              oldRefToC, refToC));
+      }
+    }
+    return refToC;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRefToC(Bz397682C newRefToC) {
-		Bz397682C oldRefToC = refToC;
-		refToC = newRefToC;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz397682C basicGetRefToC()
+  {
+    return refToC;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDbId() {
-		return dbId;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setRefToC(Bz397682C newRefToC)
+  {
+    Bz397682C oldRefToC = refToC;
+    refToC = newRefToC;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC,
+          refToC));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDbId(String newDbId) {
-		String oldDbId = dbId;
-		dbId = newDbId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__DB_ID, oldDbId, dbId));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getDbId()
+  {
+    return dbId;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRefToP((Bz397682P)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDbId(String newDbId)
+  {
+    String oldDbId = dbId;
+    dbId = newDbId;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__DB_ID, oldDbId, dbId));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				return basicSetRefToP(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      if (eInternalContainer() != null)
+        msgs = eBasicRemoveFromContainer(msgs);
+      return basicSetRefToP((Bz397682P)otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      return basicSetRefToP(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				return getRefToP();
-			case HibernateTestPackage.BZ397682_C__REF_TO_C:
-				if (resolve) return getRefToC();
-				return basicGetRefToC();
-			case HibernateTestPackage.BZ397682_C__DB_ID:
-				return getDbId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
+  {
+    switch (eContainerFeatureID())
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class,
+          msgs);
+    }
+    return super.eBasicRemoveFromContainerFeature(msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				setRefToP((Bz397682P)newValue);
-				return;
-			case HibernateTestPackage.BZ397682_C__REF_TO_C:
-				setRefToC((Bz397682C)newValue);
-				return;
-			case HibernateTestPackage.BZ397682_C__DB_ID:
-				setDbId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      return getRefToP();
+    case HibernateTestPackage.BZ397682_C__REF_TO_C:
+      if (resolve)
+        return getRefToC();
+      return basicGetRefToC();
+    case HibernateTestPackage.BZ397682_C__DB_ID:
+      return getDbId();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				setRefToP((Bz397682P)null);
-				return;
-			case HibernateTestPackage.BZ397682_C__REF_TO_C:
-				setRefToC((Bz397682C)null);
-				return;
-			case HibernateTestPackage.BZ397682_C__DB_ID:
-				setDbId(DB_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      setRefToP((Bz397682P)newValue);
+      return;
+    case HibernateTestPackage.BZ397682_C__REF_TO_C:
+      setRefToC((Bz397682C)newValue);
+      return;
+    case HibernateTestPackage.BZ397682_C__DB_ID:
+      setDbId((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_C__REF_TO_P:
-				return getRefToP() != null;
-			case HibernateTestPackage.BZ397682_C__REF_TO_C:
-				return refToC != null;
-			case HibernateTestPackage.BZ397682_C__DB_ID:
-				return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      setRefToP((Bz397682P)null);
+      return;
+    case HibernateTestPackage.BZ397682_C__REF_TO_C:
+      setRefToC((Bz397682C)null);
+      return;
+    case HibernateTestPackage.BZ397682_C__DB_ID:
+      setDbId(DB_ID_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_C__REF_TO_P:
+      return getRefToP() != null;
+    case HibernateTestPackage.BZ397682_C__REF_TO_C:
+      return refToC != null;
+    case HibernateTestPackage.BZ397682_C__DB_ID:
+      return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
+    }
+    return super.eIsSet(featureID);
+  }
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (dbId: ");
-		result.append(dbId);
-		result.append(')');
-		return result.toString();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
 
-} //Bz397682CImpl
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (dbId: ");
+    result.append(dbId);
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz397682CImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
index 99de19eb60..ecfe8224d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
@@ -40,202 +40,224 @@ import java.util.Collection;
  *
  * @generated
  */
-public class Bz397682PImpl extends EObjectImpl implements Bz397682P {
-	/**
-	 * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DB_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dbId = DB_ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getListOfC() <em>List Of C</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListOfC()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Bz397682C> listOfC;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz397682PImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ397682_P;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDbId() {
-		return dbId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDbId(String newDbId) {
-		String oldDbId = dbId;
-		dbId = newDbId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_P__DB_ID, oldDbId, dbId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Bz397682C> getListOfC() {
-		if (listOfC == null) {
-			listOfC = new EObjectContainmentWithInverseEList<Bz397682C>(Bz397682C.class, this, HibernateTestPackage.BZ397682_P__LIST_OF_C, HibernateTestPackage.BZ397682_C__REF_TO_P);
-		}
-		return listOfC;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_P__LIST_OF_C:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getListOfC()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_P__LIST_OF_C:
-				return ((InternalEList<?>)getListOfC()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_P__DB_ID:
-				return getDbId();
-			case HibernateTestPackage.BZ397682_P__LIST_OF_C:
-				return getListOfC();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_P__DB_ID:
-				setDbId((String)newValue);
-				return;
-			case HibernateTestPackage.BZ397682_P__LIST_OF_C:
-				getListOfC().clear();
-				getListOfC().addAll((Collection<? extends Bz397682C>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_P__DB_ID:
-				setDbId(DB_ID_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ397682_P__LIST_OF_C:
-				getListOfC().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ397682_P__DB_ID:
-				return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
-			case HibernateTestPackage.BZ397682_P__LIST_OF_C:
-				return listOfC != null && !listOfC.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (dbId: ");
-		result.append(dbId);
-		result.append(')');
-		return result.toString();
-	}
-
-} //Bz397682PImpl
+public class Bz397682PImpl extends EObjectImpl implements Bz397682P
+{
+  /**
+   * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected static final String DB_ID_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected String dbId = DB_ID_EDEFAULT;
+
+  /**
+   * The cached value of the '{@link #getListOfC() <em>List Of C</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getListOfC()
+   * @generated
+   * @ordered
+   */
+  protected EList<Bz397682C> listOfC;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz397682PImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ397682_P;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getDbId()
+  {
+    return dbId;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDbId(String newDbId)
+  {
+    String oldDbId = dbId;
+    dbId = newDbId;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_P__DB_ID, oldDbId, dbId));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Bz397682C> getListOfC()
+  {
+    if (listOfC == null)
+    {
+      listOfC = new EObjectContainmentWithInverseEList<Bz397682C>(Bz397682C.class, this,
+          HibernateTestPackage.BZ397682_P__LIST_OF_C, HibernateTestPackage.BZ397682_C__REF_TO_P);
+    }
+    return listOfC;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getListOfC()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+      return ((InternalEList<?>)getListOfC()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_P__DB_ID:
+      return getDbId();
+    case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+      return getListOfC();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_P__DB_ID:
+      setDbId((String)newValue);
+      return;
+    case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+      getListOfC().clear();
+      getListOfC().addAll((Collection<? extends Bz397682C>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_P__DB_ID:
+      setDbId(DB_ID_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+      getListOfC().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ397682_P__DB_ID:
+      return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
+    case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+      return listOfC != null && !listOfC.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (dbId: ");
+    result.append(dbId);
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz397682PImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057A1Impl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057A1Impl.java
index 7168f7a204..5ff2e5d8c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057A1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057A1Impl.java
@@ -24,24 +24,27 @@ import org.eclipse.emf.ecore.EClass;
  *
  * @generated
  */
-public class Bz398057A1Impl extends Bz398057AImpl implements Bz398057A1 {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz398057A1Impl() {
-		super();
-	}
+public class Bz398057A1Impl extends Bz398057AImpl implements Bz398057A1
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz398057A1Impl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ398057_A1;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ398057_A1;
+  }
 
-} //Bz398057A1Impl
+} // Bz398057A1Impl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
index 818d81a1ec..a15d4eed2a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
@@ -40,202 +40,224 @@ import java.util.Collection;
  *
  * @generated
  */
-public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
-	/**
-	 * The cached value of the '{@link #getListOfB() <em>List Of B</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListOfB()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Bz398057B> listOfB;
-
-	/**
-	 * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DB_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dbId = DB_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz398057AImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ398057_A;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Bz398057B> getListOfB() {
-		if (listOfB == null) {
-			listOfB = new EObjectContainmentWithInverseEList<Bz398057B>(Bz398057B.class, this, HibernateTestPackage.BZ398057_A__LIST_OF_B, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A);
-		}
-		return listOfB;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDbId() {
-		return dbId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDbId(String newDbId) {
-		String oldDbId = dbId;
-		dbId = newDbId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__DB_ID, oldDbId, dbId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getListOfB()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
-				return ((InternalEList<?>)getListOfB()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
-				return getListOfB();
-			case HibernateTestPackage.BZ398057_A__DB_ID:
-				return getDbId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
-				getListOfB().clear();
-				getListOfB().addAll((Collection<? extends Bz398057B>)newValue);
-				return;
-			case HibernateTestPackage.BZ398057_A__DB_ID:
-				setDbId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
-				getListOfB().clear();
-				return;
-			case HibernateTestPackage.BZ398057_A__DB_ID:
-				setDbId(DB_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
-				return listOfB != null && !listOfB.isEmpty();
-			case HibernateTestPackage.BZ398057_A__DB_ID:
-				return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (dbId: ");
-		result.append(dbId);
-		result.append(')');
-		return result.toString();
-	}
-
-} //Bz398057AImpl
+public class Bz398057AImpl extends EObjectImpl implements Bz398057A
+{
+  /**
+   * The cached value of the '{@link #getListOfB() <em>List Of B</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getListOfB()
+   * @generated
+   * @ordered
+   */
+  protected EList<Bz398057B> listOfB;
+
+  /**
+   * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected static final String DB_ID_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected String dbId = DB_ID_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz398057AImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ398057_A;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Bz398057B> getListOfB()
+  {
+    if (listOfB == null)
+    {
+      listOfB = new EObjectContainmentWithInverseEList<Bz398057B>(Bz398057B.class, this,
+          HibernateTestPackage.BZ398057_A__LIST_OF_B, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A);
+    }
+    return listOfB;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getDbId()
+  {
+    return dbId;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDbId(String newDbId)
+  {
+    String oldDbId = dbId;
+    dbId = newDbId;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__DB_ID, oldDbId, dbId));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_A__LIST_OF_B:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getListOfB()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_A__LIST_OF_B:
+      return ((InternalEList<?>)getListOfB()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_A__LIST_OF_B:
+      return getListOfB();
+    case HibernateTestPackage.BZ398057_A__DB_ID:
+      return getDbId();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_A__LIST_OF_B:
+      getListOfB().clear();
+      getListOfB().addAll((Collection<? extends Bz398057B>)newValue);
+      return;
+    case HibernateTestPackage.BZ398057_A__DB_ID:
+      setDbId((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_A__LIST_OF_B:
+      getListOfB().clear();
+      return;
+    case HibernateTestPackage.BZ398057_A__DB_ID:
+      setDbId(DB_ID_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_A__LIST_OF_B:
+      return listOfB != null && !listOfB.isEmpty();
+    case HibernateTestPackage.BZ398057_A__DB_ID:
+      return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (dbId: ");
+    result.append(dbId);
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz398057AImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
index bbf9cdaed0..110765cb25 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
@@ -30,138 +30,155 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *
  * @generated
  */
-public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1 {
-	/**
-	 * The default value of the '{@link #getValueStr() <em>Value Str</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueStr()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_STR_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getValueStr() <em>Value Str</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueStr()
-	 * @generated
-	 * @ordered
-	 */
-	protected String valueStr = VALUE_STR_EDEFAULT;
+public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1
+{
+  /**
+   * The default value of the '{@link #getValueStr() <em>Value Str</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getValueStr()
+   * @generated
+   * @ordered
+   */
+  protected static final String VALUE_STR_EDEFAULT = null;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz398057B1Impl() {
-		super();
-	}
+  /**
+   * The cached value of the '{@link #getValueStr() <em>Value Str</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getValueStr()
+   * @generated
+   * @ordered
+   */
+  protected String valueStr = VALUE_STR_EDEFAULT;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ398057_B1;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz398057B1Impl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValueStr() {
-		return valueStr;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ398057_B1;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueStr(String newValueStr) {
-		String oldValueStr = valueStr;
-		valueStr = newValueStr;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr, valueStr));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getValueStr()
+  {
+    return valueStr;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B1__VALUE_STR:
-				return getValueStr();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setValueStr(String newValueStr)
+  {
+    String oldValueStr = valueStr;
+    valueStr = newValueStr;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr,
+          valueStr));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B1__VALUE_STR:
-				setValueStr((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B1__VALUE_STR:
+      return getValueStr();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B1__VALUE_STR:
-				setValueStr(VALUE_STR_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B1__VALUE_STR:
+      setValueStr((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B1__VALUE_STR:
-				return VALUE_STR_EDEFAULT == null ? valueStr != null : !VALUE_STR_EDEFAULT.equals(valueStr);
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B1__VALUE_STR:
+      setValueStr(VALUE_STR_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B1__VALUE_STR:
+      return VALUE_STR_EDEFAULT == null ? valueStr != null : !VALUE_STR_EDEFAULT.equals(valueStr);
+    }
+    return super.eIsSet(featureID);
+  }
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (valueStr: ");
-		result.append(valueStr);
-		result.append(')');
-		return result.toString();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
 
-} //Bz398057B1Impl
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (valueStr: ");
+    result.append(valueStr);
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz398057B1Impl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
index 503f72df86..c83bbfbb29 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
@@ -37,284 +37,320 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  *
  * @generated
  */
-public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final double VALUE_EDEFAULT = 0.0;
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected double value = VALUE_EDEFAULT;
+public class Bz398057BImpl extends EObjectImpl implements Bz398057B
+{
+  /**
+   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getValue()
+   * @generated
+   * @ordered
+   */
+  protected static final double VALUE_EDEFAULT = 0.0;
 
-	/**
-	 * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DB_ID_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDbId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dbId = DB_ID_EDEFAULT;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Bz398057BImpl() {
-		super();
-	}
+  /**
+   * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getValue()
+   * @generated
+   * @ordered
+   */
+  protected double value = VALUE_EDEFAULT;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return HibernateTestPackage.Literals.BZ398057_B;
-	}
+  /**
+   * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected static final String DB_ID_EDEFAULT = null;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz398057A getRefToClassA() {
-		if (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A) return null;
-		return (Bz398057A)eContainer();
-	}
+  /**
+   * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getDbId()
+   * @generated
+   * @ordered
+   */
+  protected String dbId = DB_ID_EDEFAULT;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRefToClassA(Bz398057A newRefToClassA, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newRefToClassA, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A, msgs);
-		return msgs;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Bz398057BImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRefToClassA(Bz398057A newRefToClassA) {
-		if (newRefToClassA != eInternalContainer() || (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null)) {
-			if (EcoreUtil.isAncestor(this, newRefToClassA))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRefToClassA != null)
-				msgs = ((InternalEObject)newRefToClassA).eInverseAdd(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class, msgs);
-			msgs = basicSetRefToClassA(newRefToClassA, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A, newRefToClassA, newRefToClassA));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return HibernateTestPackage.Literals.BZ398057_B;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public double getValue() {
-		return value;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz398057A getRefToClassA()
+  {
+    if (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A)
+      return null;
+    return (Bz398057A)eContainer();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(double newValue) {
-		double oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__VALUE, oldValue, value));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetRefToClassA(Bz398057A newRefToClassA, NotificationChain msgs)
+  {
+    msgs = eBasicSetContainer((InternalEObject)newRefToClassA, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A, msgs);
+    return msgs;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDbId() {
-		return dbId;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setRefToClassA(Bz398057A newRefToClassA)
+  {
+    if (newRefToClassA != eInternalContainer()
+        || (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null))
+    {
+      if (EcoreUtil.isAncestor(this, newRefToClassA))
+        throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      NotificationChain msgs = null;
+      if (eInternalContainer() != null)
+        msgs = eBasicRemoveFromContainer(msgs);
+      if (newRefToClassA != null)
+        msgs = ((InternalEObject)newRefToClassA).eInverseAdd(this, HibernateTestPackage.BZ398057_A__LIST_OF_B,
+            Bz398057A.class, msgs);
+      msgs = basicSetRefToClassA(newRefToClassA, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A,
+          newRefToClassA, newRefToClassA));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDbId(String newDbId) {
-		String oldDbId = dbId;
-		dbId = newDbId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__DB_ID, oldDbId, dbId));
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public double getValue()
+  {
+    return value;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetRefToClassA((Bz398057A)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setValue(double newValue)
+  {
+    double oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__VALUE, oldValue, value));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				return basicSetRefToClassA(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getDbId()
+  {
+    return dbId;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setDbId(String newDbId)
+  {
+    String oldDbId = dbId;
+    dbId = newDbId;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__DB_ID, oldDbId, dbId));
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				return getRefToClassA();
-			case HibernateTestPackage.BZ398057_B__VALUE:
-				return getValue();
-			case HibernateTestPackage.BZ398057_B__DB_ID:
-				return getDbId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      if (eInternalContainer() != null)
+        msgs = eBasicRemoveFromContainer(msgs);
+      return basicSetRefToClassA((Bz398057A)otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				setRefToClassA((Bz398057A)newValue);
-				return;
-			case HibernateTestPackage.BZ398057_B__VALUE:
-				setValue((Double)newValue);
-				return;
-			case HibernateTestPackage.BZ398057_B__DB_ID:
-				setDbId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      return basicSetRefToClassA(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				setRefToClassA((Bz398057A)null);
-				return;
-			case HibernateTestPackage.BZ398057_B__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case HibernateTestPackage.BZ398057_B__DB_ID:
-				setDbId(DB_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
+  {
+    switch (eContainerFeatureID())
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class,
+          msgs);
+    }
+    return super.eBasicRemoveFromContainerFeature(msgs);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
-				return getRefToClassA() != null;
-			case HibernateTestPackage.BZ398057_B__VALUE:
-				return value != VALUE_EDEFAULT;
-			case HibernateTestPackage.BZ398057_B__DB_ID:
-				return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
-		}
-		return super.eIsSet(featureID);
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      return getRefToClassA();
+    case HibernateTestPackage.BZ398057_B__VALUE:
+      return getValue();
+    case HibernateTestPackage.BZ398057_B__DB_ID:
+      return getDbId();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      setRefToClassA((Bz398057A)newValue);
+      return;
+    case HibernateTestPackage.BZ398057_B__VALUE:
+      setValue((Double)newValue);
+      return;
+    case HibernateTestPackage.BZ398057_B__DB_ID:
+      setDbId((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(", dbId: ");
-		result.append(dbId);
-		result.append(')');
-		return result.toString();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      setRefToClassA((Bz398057A)null);
+      return;
+    case HibernateTestPackage.BZ398057_B__VALUE:
+      setValue(VALUE_EDEFAULT);
+      return;
+    case HibernateTestPackage.BZ398057_B__DB_ID:
+      setDbId(DB_ID_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
 
-} //Bz398057BImpl
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
+      return getRefToClassA() != null;
+    case HibernateTestPackage.BZ398057_B__VALUE:
+      return value != VALUE_EDEFAULT;
+    case HibernateTestPackage.BZ398057_B__DB_ID:
+      return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (value: ");
+    result.append(value);
+    result.append(", dbId: ");
+    result.append(dbId);
+    result.append(')');
+    return result.toString();
+  }
+
+} // Bz398057BImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
index 4751b764b5..8630f77d12 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
@@ -40,260 +40,305 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * <!-- end-user-doc -->
  * @generated
  */
-public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateTestFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static HibernateTestFactory init() {
-		try {
-			HibernateTestFactory theHibernateTestFactory = (HibernateTestFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.emf.cdo.tests.hibernate"); 
-			if (theHibernateTestFactory != null) {
-				return theHibernateTestFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new HibernateTestFactoryImpl();
-	}
+public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateTestFactory
+{
+  /**
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static HibernateTestFactory init()
+  {
+    try
+    {
+      HibernateTestFactory theHibernateTestFactory = (HibernateTestFactory)EPackage.Registry.INSTANCE
+          .getEFactory("http://org.eclipse.emf.cdo.tests.hibernate");
+      if (theHibernateTestFactory != null)
+      {
+        return theHibernateTestFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new HibernateTestFactoryImpl();
+  }
 
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HibernateTestFactoryImpl() {
-		super();
-	}
+  /**
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public HibernateTestFactoryImpl()
+  {
+    super();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case HibernateTestPackage.BZ356181_MAIN: return createBz356181_Main();
-			case HibernateTestPackage.BZ356181_TRANSIENT: return createBz356181_Transient();
-			case HibernateTestPackage.BZ356181_NON_TRANSIENT: return createBz356181_NonTransient();
-			case HibernateTestPackage.BZ387752_MAIN: return createBz387752_Main();
-			case HibernateTestPackage.BZ380987_GROUP: return createBz380987_Group();
-			case HibernateTestPackage.BZ380987_PLACE: return createBz380987_Place();
-			case HibernateTestPackage.BZ380987_PERSON: return createBz380987_Person();
-			case HibernateTestPackage.BZ398057_A: return createBz398057A();
-			case HibernateTestPackage.BZ398057_A1: return createBz398057A1();
-			case HibernateTestPackage.BZ398057_B: return createBz398057B();
-			case HibernateTestPackage.BZ398057_B1: return createBz398057B1();
-			case HibernateTestPackage.BZ397682_P: return createBz397682P();
-			case HibernateTestPackage.BZ397682_C: return createBz397682C();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EObject create(EClass eClass)
+  {
+    switch (eClass.getClassifierID())
+    {
+    case HibernateTestPackage.BZ356181_MAIN:
+      return createBz356181_Main();
+    case HibernateTestPackage.BZ356181_TRANSIENT:
+      return createBz356181_Transient();
+    case HibernateTestPackage.BZ356181_NON_TRANSIENT:
+      return createBz356181_NonTransient();
+    case HibernateTestPackage.BZ387752_MAIN:
+      return createBz387752_Main();
+    case HibernateTestPackage.BZ380987_GROUP:
+      return createBz380987_Group();
+    case HibernateTestPackage.BZ380987_PLACE:
+      return createBz380987_Place();
+    case HibernateTestPackage.BZ380987_PERSON:
+      return createBz380987_Person();
+    case HibernateTestPackage.BZ398057_A:
+      return createBz398057A();
+    case HibernateTestPackage.BZ398057_A1:
+      return createBz398057A1();
+    case HibernateTestPackage.BZ398057_B:
+      return createBz398057B();
+    case HibernateTestPackage.BZ398057_B1:
+      return createBz398057B1();
+    case HibernateTestPackage.BZ397682_P:
+      return createBz397682P();
+    case HibernateTestPackage.BZ397682_C:
+      return createBz397682C();
+    default:
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case HibernateTestPackage.BZ387752_ENUM:
-				return createBz387752_EnumFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object createFromString(EDataType eDataType, String initialValue)
+  {
+    switch (eDataType.getClassifierID())
+    {
+    case HibernateTestPackage.BZ387752_ENUM:
+      return createBz387752_EnumFromString(eDataType, initialValue);
+    default:
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case HibernateTestPackage.BZ387752_ENUM:
-				return convertBz387752_EnumToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String convertToString(EDataType eDataType, Object instanceValue)
+  {
+    switch (eDataType.getClassifierID())
+    {
+    case HibernateTestPackage.BZ387752_ENUM:
+      return convertBz387752_EnumToString(eDataType, instanceValue);
+    default:
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_Main createBz356181_Main() {
-		Bz356181_MainImpl bz356181_Main = new Bz356181_MainImpl();
-		return bz356181_Main;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_Main createBz356181_Main()
+  {
+    Bz356181_MainImpl bz356181_Main = new Bz356181_MainImpl();
+    return bz356181_Main;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_Transient createBz356181_Transient() {
-		Bz356181_TransientImpl bz356181_Transient = new Bz356181_TransientImpl();
-		return bz356181_Transient;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_Transient createBz356181_Transient()
+  {
+    Bz356181_TransientImpl bz356181_Transient = new Bz356181_TransientImpl();
+    return bz356181_Transient;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz356181_NonTransient createBz356181_NonTransient() {
-		Bz356181_NonTransientImpl bz356181_NonTransient = new Bz356181_NonTransientImpl();
-		return bz356181_NonTransient;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz356181_NonTransient createBz356181_NonTransient()
+  {
+    Bz356181_NonTransientImpl bz356181_NonTransient = new Bz356181_NonTransientImpl();
+    return bz356181_NonTransient;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz387752_Main createBz387752_Main() {
-		Bz387752_MainImpl bz387752_Main = new Bz387752_MainImpl();
-		return bz387752_Main;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz387752_Main createBz387752_Main()
+  {
+    Bz387752_MainImpl bz387752_Main = new Bz387752_MainImpl();
+    return bz387752_Main;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz380987_Group createBz380987_Group() {
-		Bz380987_GroupImpl bz380987_Group = new Bz380987_GroupImpl();
-		return bz380987_Group;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz380987_Group createBz380987_Group()
+  {
+    Bz380987_GroupImpl bz380987_Group = new Bz380987_GroupImpl();
+    return bz380987_Group;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz380987_Place createBz380987_Place() {
-		Bz380987_PlaceImpl bz380987_Place = new Bz380987_PlaceImpl();
-		return bz380987_Place;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz380987_Place createBz380987_Place()
+  {
+    Bz380987_PlaceImpl bz380987_Place = new Bz380987_PlaceImpl();
+    return bz380987_Place;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz380987_Person createBz380987_Person() {
-		Bz380987_PersonImpl bz380987_Person = new Bz380987_PersonImpl();
-		return bz380987_Person;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz380987_Person createBz380987_Person()
+  {
+    Bz380987_PersonImpl bz380987_Person = new Bz380987_PersonImpl();
+    return bz380987_Person;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz398057A createBz398057A() {
-		Bz398057AImpl bz398057A = new Bz398057AImpl();
-		return bz398057A;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz398057A createBz398057A()
+  {
+    Bz398057AImpl bz398057A = new Bz398057AImpl();
+    return bz398057A;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz398057A1 createBz398057A1() {
-		Bz398057A1Impl bz398057A1 = new Bz398057A1Impl();
-		return bz398057A1;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz398057A1 createBz398057A1()
+  {
+    Bz398057A1Impl bz398057A1 = new Bz398057A1Impl();
+    return bz398057A1;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz398057B createBz398057B() {
-		Bz398057BImpl bz398057B = new Bz398057BImpl();
-		return bz398057B;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz398057B createBz398057B()
+  {
+    Bz398057BImpl bz398057B = new Bz398057BImpl();
+    return bz398057B;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz398057B1 createBz398057B1() {
-		Bz398057B1Impl bz398057B1 = new Bz398057B1Impl();
-		return bz398057B1;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz398057B1 createBz398057B1()
+  {
+    Bz398057B1Impl bz398057B1 = new Bz398057B1Impl();
+    return bz398057B1;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz397682P createBz397682P() {
-		Bz397682PImpl bz397682P = new Bz397682PImpl();
-		return bz397682P;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz397682P createBz397682P()
+  {
+    Bz397682PImpl bz397682P = new Bz397682PImpl();
+    return bz397682P;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz397682C createBz397682C() {
-		Bz397682CImpl bz397682C = new Bz397682CImpl();
-		return bz397682C;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz397682C createBz397682C()
+  {
+    Bz397682CImpl bz397682C = new Bz397682CImpl();
+    return bz397682C;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Bz387752_Enum createBz387752_EnumFromString(EDataType eDataType, String initialValue) {
-		Bz387752_Enum result = Bz387752_Enum.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Bz387752_Enum createBz387752_EnumFromString(EDataType eDataType, String initialValue)
+  {
+    Bz387752_Enum result = Bz387752_Enum.get(initialValue);
+    if (result == null)
+      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+          + eDataType.getName() + "'");
+    return result;
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBz387752_EnumToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String convertBz387752_EnumToString(EDataType eDataType, Object instanceValue)
+  {
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HibernateTestPackage getHibernateTestPackage() {
-		return (HibernateTestPackage)getEPackage();
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public HibernateTestPackage getHibernateTestPackage()
+  {
+    return (HibernateTestPackage)getEPackage();
+  }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static HibernateTestPackage getPackage() {
-		return HibernateTestPackage.eINSTANCE;
-	}
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @deprecated
+   * @generated
+   */
+  @Deprecated
+  public static HibernateTestPackage getPackage()
+  {
+    return HibernateTestPackage.eINSTANCE;
+  }
 
-} //HibernateTestFactoryImpl
+} // HibernateTestFactoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
index 665ca23902..67516fac80 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
@@ -40,769 +40,831 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
  * <!-- end-user-doc -->
  * @generated
  */
-public class HibernateTestPackageImpl extends EPackageImpl implements HibernateTestPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz356181_MainEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz356181_TransientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz356181_NonTransientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz387752_MainEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz380987_GroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz380987_PlaceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz380987_PersonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz398057AEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz398057A1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz398057BEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz398057B1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz397682PEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bz397682CEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum bz387752_EnumEEnum = 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.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private HibernateTestPackageImpl() {
-		super(eNS_URI, HibernateTestFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link HibernateTestPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static HibernateTestPackage init() {
-		if (isInited) return (HibernateTestPackage)EPackage.Registry.INSTANCE.getEPackage(HibernateTestPackage.eNS_URI);
-
-		// Obtain or create and register package
-		HibernateTestPackageImpl theHibernateTestPackage = (HibernateTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HibernateTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HibernateTestPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theHibernateTestPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theHibernateTestPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theHibernateTestPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(HibernateTestPackage.eNS_URI, theHibernateTestPackage);
-		return theHibernateTestPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz356181_Main() {
-		return bz356181_MainEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz356181_Main_Transient() {
-		return (EAttribute)bz356181_MainEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz356181_Main_NonTransient() {
-		return (EAttribute)bz356181_MainEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz356181_Main_TransientRef() {
-		return (EReference)bz356181_MainEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz356181_Main_TransientOtherRef() {
-		return (EReference)bz356181_MainEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz356181_Transient() {
-		return bz356181_TransientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz356181_NonTransient() {
-		return bz356181_NonTransientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz356181_NonTransient_Main() {
-		return (EReference)bz356181_NonTransientEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz387752_Main() {
-		return bz387752_MainEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz387752_Main_StrUnsettable() {
-		return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz387752_Main_StrSettable() {
-		return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz387752_Main_EnumSettable() {
-		return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz387752_Main_EnumUnsettable() {
-		return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz380987_Group() {
-		return bz380987_GroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz380987_Group_People() {
-		return (EReference)bz380987_GroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz380987_Place() {
-		return bz380987_PlaceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz380987_Place_Name() {
-		return (EAttribute)bz380987_PlaceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz380987_Place_People() {
-		return (EReference)bz380987_PlaceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz380987_Person() {
-		return bz380987_PersonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz380987_Person_Name() {
-		return (EAttribute)bz380987_PersonEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz380987_Person_Group() {
-		return (EReference)bz380987_PersonEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz380987_Person_Places() {
-		return (EReference)bz380987_PersonEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz398057A() {
-		return bz398057AEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz398057A_ListOfB() {
-		return (EReference)bz398057AEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz398057A_DbId() {
-		return (EAttribute)bz398057AEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz398057A1() {
-		return bz398057A1EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz398057B() {
-		return bz398057BEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz398057B_RefToClassA() {
-		return (EReference)bz398057BEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz398057B_Value() {
-		return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz398057B_DbId() {
-		return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz398057B1() {
-		return bz398057B1EClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz398057B1_ValueStr() {
-		return (EAttribute)bz398057B1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz397682P() {
-		return bz397682PEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz397682P_DbId() {
-		return (EAttribute)bz397682PEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz397682P_ListOfC() {
-		return (EReference)bz397682PEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBz397682C() {
-		return bz397682CEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz397682C_RefToP() {
-		return (EReference)bz397682CEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBz397682C_RefToC() {
-		return (EReference)bz397682CEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBz397682C_DbId() {
-		return (EAttribute)bz397682CEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getBz387752_Enum() {
-		return bz387752_EnumEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HibernateTestFactory getHibernateTestFactory() {
-		return (HibernateTestFactory)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
-		bz356181_MainEClass = createEClass(BZ356181_MAIN);
-		createEAttribute(bz356181_MainEClass, BZ356181_MAIN__TRANSIENT);
-		createEAttribute(bz356181_MainEClass, BZ356181_MAIN__NON_TRANSIENT);
-		createEReference(bz356181_MainEClass, BZ356181_MAIN__TRANSIENT_REF);
-		createEReference(bz356181_MainEClass, BZ356181_MAIN__TRANSIENT_OTHER_REF);
-
-		bz356181_TransientEClass = createEClass(BZ356181_TRANSIENT);
-
-		bz356181_NonTransientEClass = createEClass(BZ356181_NON_TRANSIENT);
-		createEReference(bz356181_NonTransientEClass, BZ356181_NON_TRANSIENT__MAIN);
-
-		bz387752_MainEClass = createEClass(BZ387752_MAIN);
-		createEAttribute(bz387752_MainEClass, BZ387752_MAIN__STR_UNSETTABLE);
-		createEAttribute(bz387752_MainEClass, BZ387752_MAIN__STR_SETTABLE);
-		createEAttribute(bz387752_MainEClass, BZ387752_MAIN__ENUM_SETTABLE);
-		createEAttribute(bz387752_MainEClass, BZ387752_MAIN__ENUM_UNSETTABLE);
-
-		bz380987_GroupEClass = createEClass(BZ380987_GROUP);
-		createEReference(bz380987_GroupEClass, BZ380987_GROUP__PEOPLE);
-
-		bz380987_PlaceEClass = createEClass(BZ380987_PLACE);
-		createEAttribute(bz380987_PlaceEClass, BZ380987_PLACE__NAME);
-		createEReference(bz380987_PlaceEClass, BZ380987_PLACE__PEOPLE);
-
-		bz380987_PersonEClass = createEClass(BZ380987_PERSON);
-		createEAttribute(bz380987_PersonEClass, BZ380987_PERSON__NAME);
-		createEReference(bz380987_PersonEClass, BZ380987_PERSON__GROUP);
-		createEReference(bz380987_PersonEClass, BZ380987_PERSON__PLACES);
-
-		bz398057AEClass = createEClass(BZ398057_A);
-		createEReference(bz398057AEClass, BZ398057_A__LIST_OF_B);
-		createEAttribute(bz398057AEClass, BZ398057_A__DB_ID);
-
-		bz398057A1EClass = createEClass(BZ398057_A1);
-
-		bz398057BEClass = createEClass(BZ398057_B);
-		createEReference(bz398057BEClass, BZ398057_B__REF_TO_CLASS_A);
-		createEAttribute(bz398057BEClass, BZ398057_B__VALUE);
-		createEAttribute(bz398057BEClass, BZ398057_B__DB_ID);
-
-		bz398057B1EClass = createEClass(BZ398057_B1);
-		createEAttribute(bz398057B1EClass, BZ398057_B1__VALUE_STR);
-
-		bz397682PEClass = createEClass(BZ397682_P);
-		createEAttribute(bz397682PEClass, BZ397682_P__DB_ID);
-		createEReference(bz397682PEClass, BZ397682_P__LIST_OF_C);
-
-		bz397682CEClass = createEClass(BZ397682_C);
-		createEReference(bz397682CEClass, BZ397682_C__REF_TO_P);
-		createEReference(bz397682CEClass, BZ397682_C__REF_TO_C);
-		createEAttribute(bz397682CEClass, BZ397682_C__DB_ID);
-
-		// Create enums
-		bz387752_EnumEEnum = createEEnum(BZ387752_ENUM);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		bz398057A1EClass.getESuperTypes().add(this.getBz398057A());
-		bz398057B1EClass.getESuperTypes().add(this.getBz398057B());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(bz356181_MainEClass, Bz356181_Main.class, "Bz356181_Main", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBz356181_Main_Transient(), ecorePackage.getEString(), "transient", null, 0, 1, Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz356181_Main_NonTransient(), ecorePackage.getEString(), "nonTransient", null, 0, 1, Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz356181_Main_TransientRef(), this.getBz356181_Transient(), null, "transientRef", null, 0, 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz356181_Main_TransientOtherRef(), this.getBz356181_NonTransient(), null, "transientOtherRef", null, 0, 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz356181_TransientEClass, Bz356181_Transient.class, "Bz356181_Transient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(bz356181_NonTransientEClass, Bz356181_NonTransient.class, "Bz356181_NonTransient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBz356181_NonTransient_Main(), this.getBz356181_Main(), null, "main", null, 0, 1, Bz356181_NonTransient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz387752_MainEClass, Bz387752_Main.class, "Bz387752_Main", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBz387752_Main_StrUnsettable(), ecorePackage.getEString(), "strUnsettable", "def_value", 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz387752_Main_StrSettable(), ecorePackage.getEString(), "strSettable", "value", 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz387752_Main_EnumSettable(), this.getBz387752_Enum(), "enumSettable", null, 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz387752_Main_EnumUnsettable(), this.getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1, Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz380987_GroupEClass, Bz380987_Group.class, "Bz380987_Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBz380987_Group_People(), this.getBz380987_Person(), this.getBz380987_Person_Group(), "people", null, 0, -1, Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz380987_PlaceEClass, Bz380987_Place.class, "Bz380987_Place", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBz380987_Place_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz380987_Place_People(), this.getBz380987_Person(), this.getBz380987_Person_Places(), "people", null, 0, -1, Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz380987_PersonEClass, Bz380987_Person.class, "Bz380987_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBz380987_Person_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz380987_Person_Group(), this.getBz380987_Group(), this.getBz380987_Group_People(), "group", null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz380987_Person_Places(), this.getBz380987_Place(), this.getBz380987_Place_People(), "places", null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz398057AEClass, Bz398057A.class, "Bz398057A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBz398057A_ListOfB(), this.getBz398057B(), this.getBz398057B_RefToClassA(), "listOfB", null, 0, -1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz398057A_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz398057A1EClass, Bz398057A1.class, "Bz398057A1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(bz398057BEClass, Bz398057B.class, "Bz398057B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBz398057B_RefToClassA(), this.getBz398057A(), this.getBz398057A_ListOfB(), "refToClassA", null, 0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz398057B_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz398057B1EClass, Bz398057B1.class, "Bz398057B1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBz398057B1_ValueStr(), ecorePackage.getEString(), "valueStr", null, 0, 1, Bz398057B1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz397682PEClass, Bz397682P.class, "Bz397682P", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBz397682P_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz397682P_ListOfC(), this.getBz397682C(), this.getBz397682C_RefToP(), "listOfC", null, 0, -1, Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bz397682CEClass, Bz397682C.class, "Bz397682C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBz397682C_RefToP(), this.getBz397682P(), this.getBz397682P_ListOfC(), "refToP", null, 0, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBz397682C_RefToC(), this.getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBz397682C_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(bz387752_EnumEEnum, Bz387752_Enum.class, "Bz387752_Enum");
-		addEEnumLiteral(bz387752_EnumEEnum, Bz387752_Enum.VAL0);
-		addEEnumLiteral(bz387752_EnumEEnum, Bz387752_Enum.VAL1);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// teneo.jpa
-		createTeneoAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>teneo.jpa</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createTeneoAnnotations() {
-		String source = "teneo.jpa";		
-		addAnnotation
-		  (getBz356181_Main_Transient(), 
-		   source, 
-		   new String[] {
-			 "value", "@Transient"
-		   });		
-		addAnnotation
-		  (bz356181_TransientEClass, 
-		   source, 
-		   new String[] {
-			 "value", "@Transient"
-		   });		
-		addAnnotation
-		  (bz398057AEClass, 
-		   source, 
-		   new String[] {
-			 "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"
-		   });		
-		addAnnotation
-		  (getBz398057A_DbId(), 
-		   source, 
-		   new String[] {
-			 "value", "@Id"
-		   });		
-		addAnnotation
-		  (bz398057BEClass, 
-		   source, 
-		   new String[] {
-			 "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"
-		   });		
-		addAnnotation
-		  (getBz398057B_DbId(), 
-		   source, 
-		   new String[] {
-			 "value", "@Id"
-		   });		
-		addAnnotation
-		  (bz397682PEClass, 
-		   source, 
-		   new String[] {
-			 "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"
-		   });		
-		addAnnotation
-		  (getBz397682P_DbId(), 
-		   source, 
-		   new String[] {
-			 "value", "@Id"
-		   });		
-		addAnnotation
-		  (getBz397682C_DbId(), 
-		   source, 
-		   new String[] {
-			 "value", "@Id"
-		   });
-	}
-
-} //HibernateTestPackageImpl
+public class HibernateTestPackageImpl extends EPackageImpl implements HibernateTestPackage
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz356181_MainEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz356181_TransientEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz356181_NonTransientEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz387752_MainEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz380987_GroupEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz380987_PlaceEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz380987_PersonEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz398057AEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz398057A1EClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz398057BEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz398057B1EClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz397682PEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass bz397682CEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EEnum bz387752_EnumEEnum = 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.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private HibernateTestPackageImpl()
+  {
+    super(eNS_URI, HibernateTestFactory.eINSTANCE);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static boolean isInited = false;
+
+  /**
+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+   * 
+   * <p>This method is used to initialize {@link HibernateTestPackage#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
+  public static HibernateTestPackage init()
+  {
+    if (isInited)
+      return (HibernateTestPackage)EPackage.Registry.INSTANCE.getEPackage(HibernateTestPackage.eNS_URI);
+
+    // Obtain or create and register package
+    HibernateTestPackageImpl theHibernateTestPackage = (HibernateTestPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof HibernateTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+        : new HibernateTestPackageImpl());
+
+    isInited = true;
+
+    // Create package meta-data objects
+    theHibernateTestPackage.createPackageContents();
+
+    // Initialize created meta-data
+    theHibernateTestPackage.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theHibernateTestPackage.freeze();
+
+    // Update the registry and return the package
+    EPackage.Registry.INSTANCE.put(HibernateTestPackage.eNS_URI, theHibernateTestPackage);
+    return theHibernateTestPackage;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz356181_Main()
+  {
+    return bz356181_MainEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz356181_Main_Transient()
+  {
+    return (EAttribute)bz356181_MainEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz356181_Main_NonTransient()
+  {
+    return (EAttribute)bz356181_MainEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz356181_Main_TransientRef()
+  {
+    return (EReference)bz356181_MainEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz356181_Main_TransientOtherRef()
+  {
+    return (EReference)bz356181_MainEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz356181_Transient()
+  {
+    return bz356181_TransientEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz356181_NonTransient()
+  {
+    return bz356181_NonTransientEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz356181_NonTransient_Main()
+  {
+    return (EReference)bz356181_NonTransientEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz387752_Main()
+  {
+    return bz387752_MainEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz387752_Main_StrUnsettable()
+  {
+    return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz387752_Main_StrSettable()
+  {
+    return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz387752_Main_EnumSettable()
+  {
+    return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz387752_Main_EnumUnsettable()
+  {
+    return (EAttribute)bz387752_MainEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz380987_Group()
+  {
+    return bz380987_GroupEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz380987_Group_People()
+  {
+    return (EReference)bz380987_GroupEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz380987_Place()
+  {
+    return bz380987_PlaceEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz380987_Place_Name()
+  {
+    return (EAttribute)bz380987_PlaceEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz380987_Place_People()
+  {
+    return (EReference)bz380987_PlaceEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz380987_Person()
+  {
+    return bz380987_PersonEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz380987_Person_Name()
+  {
+    return (EAttribute)bz380987_PersonEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz380987_Person_Group()
+  {
+    return (EReference)bz380987_PersonEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz380987_Person_Places()
+  {
+    return (EReference)bz380987_PersonEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz398057A()
+  {
+    return bz398057AEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz398057A_ListOfB()
+  {
+    return (EReference)bz398057AEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz398057A_DbId()
+  {
+    return (EAttribute)bz398057AEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz398057A1()
+  {
+    return bz398057A1EClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz398057B()
+  {
+    return bz398057BEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz398057B_RefToClassA()
+  {
+    return (EReference)bz398057BEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz398057B_Value()
+  {
+    return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz398057B_DbId()
+  {
+    return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz398057B1()
+  {
+    return bz398057B1EClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz398057B1_ValueStr()
+  {
+    return (EAttribute)bz398057B1EClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz397682P()
+  {
+    return bz397682PEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz397682P_DbId()
+  {
+    return (EAttribute)bz397682PEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz397682P_ListOfC()
+  {
+    return (EReference)bz397682PEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getBz397682C()
+  {
+    return bz397682CEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz397682C_RefToP()
+  {
+    return (EReference)bz397682CEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getBz397682C_RefToC()
+  {
+    return (EReference)bz397682CEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getBz397682C_DbId()
+  {
+    return (EAttribute)bz397682CEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EEnum getBz387752_Enum()
+  {
+    return bz387752_EnumEEnum;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public HibernateTestFactory getHibernateTestFactory()
+  {
+    return (HibernateTestFactory)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
+    bz356181_MainEClass = createEClass(BZ356181_MAIN);
+    createEAttribute(bz356181_MainEClass, BZ356181_MAIN__TRANSIENT);
+    createEAttribute(bz356181_MainEClass, BZ356181_MAIN__NON_TRANSIENT);
+    createEReference(bz356181_MainEClass, BZ356181_MAIN__TRANSIENT_REF);
+    createEReference(bz356181_MainEClass, BZ356181_MAIN__TRANSIENT_OTHER_REF);
+
+    bz356181_TransientEClass = createEClass(BZ356181_TRANSIENT);
+
+    bz356181_NonTransientEClass = createEClass(BZ356181_NON_TRANSIENT);
+    createEReference(bz356181_NonTransientEClass, BZ356181_NON_TRANSIENT__MAIN);
+
+    bz387752_MainEClass = createEClass(BZ387752_MAIN);
+    createEAttribute(bz387752_MainEClass, BZ387752_MAIN__STR_UNSETTABLE);
+    createEAttribute(bz387752_MainEClass, BZ387752_MAIN__STR_SETTABLE);
+    createEAttribute(bz387752_MainEClass, BZ387752_MAIN__ENUM_SETTABLE);
+    createEAttribute(bz387752_MainEClass, BZ387752_MAIN__ENUM_UNSETTABLE);
+
+    bz380987_GroupEClass = createEClass(BZ380987_GROUP);
+    createEReference(bz380987_GroupEClass, BZ380987_GROUP__PEOPLE);
+
+    bz380987_PlaceEClass = createEClass(BZ380987_PLACE);
+    createEAttribute(bz380987_PlaceEClass, BZ380987_PLACE__NAME);
+    createEReference(bz380987_PlaceEClass, BZ380987_PLACE__PEOPLE);
+
+    bz380987_PersonEClass = createEClass(BZ380987_PERSON);
+    createEAttribute(bz380987_PersonEClass, BZ380987_PERSON__NAME);
+    createEReference(bz380987_PersonEClass, BZ380987_PERSON__GROUP);
+    createEReference(bz380987_PersonEClass, BZ380987_PERSON__PLACES);
+
+    bz398057AEClass = createEClass(BZ398057_A);
+    createEReference(bz398057AEClass, BZ398057_A__LIST_OF_B);
+    createEAttribute(bz398057AEClass, BZ398057_A__DB_ID);
+
+    bz398057A1EClass = createEClass(BZ398057_A1);
+
+    bz398057BEClass = createEClass(BZ398057_B);
+    createEReference(bz398057BEClass, BZ398057_B__REF_TO_CLASS_A);
+    createEAttribute(bz398057BEClass, BZ398057_B__VALUE);
+    createEAttribute(bz398057BEClass, BZ398057_B__DB_ID);
+
+    bz398057B1EClass = createEClass(BZ398057_B1);
+    createEAttribute(bz398057B1EClass, BZ398057_B1__VALUE_STR);
+
+    bz397682PEClass = createEClass(BZ397682_P);
+    createEAttribute(bz397682PEClass, BZ397682_P__DB_ID);
+    createEReference(bz397682PEClass, BZ397682_P__LIST_OF_C);
+
+    bz397682CEClass = createEClass(BZ397682_C);
+    createEReference(bz397682CEClass, BZ397682_C__REF_TO_P);
+    createEReference(bz397682CEClass, BZ397682_C__REF_TO_C);
+    createEAttribute(bz397682CEClass, BZ397682_C__DB_ID);
+
+    // Create enums
+    bz387752_EnumEEnum = createEEnum(BZ387752_ENUM);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isInitialized = false;
+
+  /**
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void initializePackageContents()
+  {
+    if (isInitialized)
+      return;
+    isInitialized = true;
+
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+    bz398057A1EClass.getESuperTypes().add(this.getBz398057A());
+    bz398057B1EClass.getESuperTypes().add(this.getBz398057B());
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(bz356181_MainEClass, Bz356181_Main.class, "Bz356181_Main", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz356181_Main_Transient(), ecorePackage.getEString(), "transient", null, 0, 1,
+        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz356181_Main_NonTransient(), ecorePackage.getEString(), "nonTransient", null, 0, 1,
+        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz356181_Main_TransientRef(), this.getBz356181_Transient(), null, "transientRef", null, 0, 1,
+        Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz356181_Main_TransientOtherRef(), this.getBz356181_NonTransient(), null, "transientOtherRef",
+        null, 0, 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz356181_TransientEClass, Bz356181_Transient.class, "Bz356181_Transient", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(bz356181_NonTransientEClass, Bz356181_NonTransient.class, "Bz356181_NonTransient", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz356181_NonTransient_Main(), this.getBz356181_Main(), null, "main", null, 0, 1,
+        Bz356181_NonTransient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz387752_MainEClass, Bz387752_Main.class, "Bz387752_Main", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz387752_Main_StrUnsettable(), ecorePackage.getEString(), "strUnsettable", "def_value", 0, 1,
+        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getBz387752_Main_StrSettable(), ecorePackage.getEString(), "strSettable", "value", 0, 1,
+        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz387752_Main_EnumSettable(), this.getBz387752_Enum(), "enumSettable", null, 0, 1,
+        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz387752_Main_EnumUnsettable(), this.getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1,
+        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+
+    initEClass(bz380987_GroupEClass, Bz380987_Group.class, "Bz380987_Group", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz380987_Group_People(), this.getBz380987_Person(), this.getBz380987_Person_Group(), "people",
+        null, 0, -1, Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz380987_PlaceEClass, Bz380987_Place.class, "Bz380987_Place", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz380987_Place_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Place.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Place_People(), this.getBz380987_Person(), this.getBz380987_Person_Places(), "people",
+        null, 0, -1, Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz380987_PersonEClass, Bz380987_Person.class, "Bz380987_Person", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz380987_Person_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Person.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Person_Group(), this.getBz380987_Group(), this.getBz380987_Group_People(), "group",
+        null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Person_Places(), this.getBz380987_Place(), this.getBz380987_Place_People(), "places",
+        null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz398057AEClass, Bz398057A.class, "Bz398057A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz398057A_ListOfB(), this.getBz398057B(), this.getBz398057B_RefToClassA(), "listOfB", null, 0,
+        -1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057A_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057A.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz398057A1EClass, Bz398057A1.class, "Bz398057A1", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(bz398057BEClass, Bz398057B.class, "Bz398057B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz398057B_RefToClassA(), this.getBz398057A(), this.getBz398057A_ListOfB(), "refToClassA", null,
+        0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057B_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057B.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz398057B1EClass, Bz398057B1.class, "Bz398057B1", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz398057B1_ValueStr(), ecorePackage.getEString(), "valueStr", null, 0, 1, Bz398057B1.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz397682PEClass, Bz397682P.class, "Bz397682P", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBz397682P_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682P.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz397682P_ListOfC(), this.getBz397682C(), this.getBz397682C_RefToP(), "listOfC", null, 0, -1,
+        Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bz397682CEClass, Bz397682C.class, "Bz397682C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBz397682C_RefToP(), this.getBz397682P(), this.getBz397682P_ListOfC(), "refToP", null, 0, 1,
+        Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz397682C_RefToC(), this.getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz397682C_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682C.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    // Initialize enums and add enum literals
+    initEEnum(bz387752_EnumEEnum, Bz387752_Enum.class, "Bz387752_Enum");
+    addEEnumLiteral(bz387752_EnumEEnum, Bz387752_Enum.VAL0);
+    addEEnumLiteral(bz387752_EnumEEnum, Bz387752_Enum.VAL1);
+
+    // Create resource
+    createResource(eNS_URI);
+
+    // Create annotations
+    // teneo.jpa
+    createTeneoAnnotations();
+  }
+
+  /**
+   * Initializes the annotations for <b>teneo.jpa</b>.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected void createTeneoAnnotations()
+  {
+    String source = "teneo.jpa";
+    addAnnotation(getBz356181_Main_Transient(), source, new String[] { "value", "@Transient" });
+    addAnnotation(bz356181_TransientEClass, source, new String[] { "value", "@Transient" });
+    addAnnotation(bz398057AEClass, source, new String[] { "value",
+        "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(getBz398057A_DbId(), source, new String[] { "value", "@Id" });
+    addAnnotation(bz398057BEClass, source, new String[] { "value",
+        "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(getBz398057B_DbId(), source, new String[] { "value", "@Id" });
+    addAnnotation(bz397682PEClass, source, new String[] { "value",
+        "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(getBz397682P_DbId(), source, new String[] { "value", "@Id" });
+    addAnnotation(getBz397682C_DbId(), source, new String[] { "value", "@Id" });
+  }
+
+} // HibernateTestPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java
index 9ae8b20a4f..c849e62ba4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;
 
-import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.*;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient;
@@ -18,6 +17,12 @@ import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage;
 
 import org.eclipse.emf.common.notify.Adapter;
@@ -33,318 +38,365 @@ import org.eclipse.emf.ecore.EObject;
  * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage
  * @generated
  */
-public class HibernateTestAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static HibernateTestPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HibernateTestAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = HibernateTestPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HibernateTestSwitch<Adapter> modelSwitch =
-		new HibernateTestSwitch<Adapter>() {
-			@Override
-			public Adapter caseBz356181_Main(Bz356181_Main object) {
-				return createBz356181_MainAdapter();
-			}
-			@Override
-			public Adapter caseBz356181_Transient(Bz356181_Transient object) {
-				return createBz356181_TransientAdapter();
-			}
-			@Override
-			public Adapter caseBz356181_NonTransient(Bz356181_NonTransient object) {
-				return createBz356181_NonTransientAdapter();
-			}
-			@Override
-			public Adapter caseBz387752_Main(Bz387752_Main object) {
-				return createBz387752_MainAdapter();
-			}
-			@Override
-			public Adapter caseBz380987_Group(Bz380987_Group object) {
-				return createBz380987_GroupAdapter();
-			}
-			@Override
-			public Adapter caseBz380987_Place(Bz380987_Place object) {
-				return createBz380987_PlaceAdapter();
-			}
-			@Override
-			public Adapter caseBz380987_Person(Bz380987_Person object) {
-				return createBz380987_PersonAdapter();
-			}
-			@Override
-			public Adapter caseBz398057A(Bz398057A object) {
-				return createBz398057AAdapter();
-			}
-			@Override
-			public Adapter caseBz398057A1(Bz398057A1 object) {
-				return createBz398057A1Adapter();
-			}
-			@Override
-			public Adapter caseBz398057B(Bz398057B object) {
-				return createBz398057BAdapter();
-			}
-			@Override
-			public Adapter caseBz398057B1(Bz398057B1 object) {
-				return createBz398057B1Adapter();
-			}
-			@Override
-			public Adapter caseBz397682P(Bz397682P object) {
-				return createBz397682PAdapter();
-			}
-			@Override
-			public Adapter caseBz397682C(Bz397682C object) {
-				return createBz397682CAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main <em>Bz356181 Main</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.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main
-	 * @generated
-	 */
-	public Adapter createBz356181_MainAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient <em>Bz356181 Transient</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.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient
-	 * @generated
-	 */
-	public Adapter createBz356181_TransientAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient <em>Bz356181 Non Transient</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.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient
-	 * @generated
-	 */
-	public Adapter createBz356181_NonTransientAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main <em>Bz387752 Main</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.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main
-	 * @generated
-	 */
-	public Adapter createBz387752_MainAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group <em>Bz380987 Group</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.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group
-	 * @generated
-	 */
-	public Adapter createBz380987_GroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place <em>Bz380987 Place</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.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place
-	 * @generated
-	 */
-	public Adapter createBz380987_PlaceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person <em>Bz380987 Person</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person
-	 * @generated
-	 */
-	public Adapter createBz380987_PersonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A <em>Bz398057 A</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.cdo.tests.hibernate.model.HibernateTest.Bz398057A
-	 * @generated
-	 */
-	public Adapter createBz398057AAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</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.cdo.tests.hibernate.model.HibernateTest.Bz398057A1
-	 * @generated
-	 */
-	public Adapter createBz398057A1Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B <em>Bz398057 B</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.cdo.tests.hibernate.model.HibernateTest.Bz398057B
-	 * @generated
-	 */
-	public Adapter createBz398057BAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</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.cdo.tests.hibernate.model.HibernateTest.Bz398057B1
-	 * @generated
-	 */
-	public Adapter createBz398057B1Adapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P <em>Bz397682 P</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.cdo.tests.hibernate.model.HibernateTest.Bz397682P
-	 * @generated
-	 */
-	public Adapter createBz397682PAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C <em>Bz397682 C</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.cdo.tests.hibernate.model.HibernateTest.Bz397682C
-	 * @generated
-	 */
-	public Adapter createBz397682CAdapter() {
-		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;
-	}
-
-} //HibernateTestAdapterFactory
+public class HibernateTestAdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static HibernateTestPackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public HibernateTestAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = HibernateTestPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc -->
+   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+   * <!-- end-user-doc -->
+   * @return whether this factory is applicable for the type of the object.
+   * @generated
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
+
+  /**
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected HibernateTestSwitch<Adapter> modelSwitch = new HibernateTestSwitch<Adapter>()
+  {
+    @Override
+    public Adapter caseBz356181_Main(Bz356181_Main object)
+    {
+      return createBz356181_MainAdapter();
+    }
+
+    @Override
+    public Adapter caseBz356181_Transient(Bz356181_Transient object)
+    {
+      return createBz356181_TransientAdapter();
+    }
+
+    @Override
+    public Adapter caseBz356181_NonTransient(Bz356181_NonTransient object)
+    {
+      return createBz356181_NonTransientAdapter();
+    }
+
+    @Override
+    public Adapter caseBz387752_Main(Bz387752_Main object)
+    {
+      return createBz387752_MainAdapter();
+    }
+
+    @Override
+    public Adapter caseBz380987_Group(Bz380987_Group object)
+    {
+      return createBz380987_GroupAdapter();
+    }
+
+    @Override
+    public Adapter caseBz380987_Place(Bz380987_Place object)
+    {
+      return createBz380987_PlaceAdapter();
+    }
+
+    @Override
+    public Adapter caseBz380987_Person(Bz380987_Person object)
+    {
+      return createBz380987_PersonAdapter();
+    }
+
+    @Override
+    public Adapter caseBz398057A(Bz398057A object)
+    {
+      return createBz398057AAdapter();
+    }
+
+    @Override
+    public Adapter caseBz398057A1(Bz398057A1 object)
+    {
+      return createBz398057A1Adapter();
+    }
+
+    @Override
+    public Adapter caseBz398057B(Bz398057B object)
+    {
+      return createBz398057BAdapter();
+    }
+
+    @Override
+    public Adapter caseBz398057B1(Bz398057B1 object)
+    {
+      return createBz398057B1Adapter();
+    }
+
+    @Override
+    public Adapter caseBz397682P(Bz397682P object)
+    {
+      return createBz397682PAdapter();
+    }
+
+    @Override
+    public Adapter caseBz397682C(Bz397682C object)
+    {
+      return createBz397682CAdapter();
+    }
+
+    @Override
+    public Adapter defaultCase(EObject object)
+    {
+      return createEObjectAdapter();
+    }
+  };
+
+  /**
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param target the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main <em>Bz356181 Main</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.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main
+   * @generated
+   */
+  public Adapter createBz356181_MainAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient <em>Bz356181 Transient</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.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient
+   * @generated
+   */
+  public Adapter createBz356181_TransientAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient <em>Bz356181 Non Transient</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.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient
+   * @generated
+   */
+  public Adapter createBz356181_NonTransientAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main <em>Bz387752 Main</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.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main
+   * @generated
+   */
+  public Adapter createBz387752_MainAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group <em>Bz380987 Group</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.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group
+   * @generated
+   */
+  public Adapter createBz380987_GroupAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place <em>Bz380987 Place</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.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place
+   * @generated
+   */
+  public Adapter createBz380987_PlaceAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person <em>Bz380987 Person</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person
+   * @generated
+   */
+  public Adapter createBz380987_PersonAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A <em>Bz398057 A</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.cdo.tests.hibernate.model.HibernateTest.Bz398057A
+   * @generated
+   */
+  public Adapter createBz398057AAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</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.cdo.tests.hibernate.model.HibernateTest.Bz398057A1
+   * @generated
+   */
+  public Adapter createBz398057A1Adapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B <em>Bz398057 B</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.cdo.tests.hibernate.model.HibernateTest.Bz398057B
+   * @generated
+   */
+  public Adapter createBz398057BAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</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.cdo.tests.hibernate.model.HibernateTest.Bz398057B1
+   * @generated
+   */
+  public Adapter createBz398057B1Adapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P <em>Bz397682 P</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.cdo.tests.hibernate.model.HibernateTest.Bz397682P
+   * @generated
+   */
+  public Adapter createBz397682PAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C <em>Bz397682 C</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.cdo.tests.hibernate.model.HibernateTest.Bz397682C
+   * @generated
+   */
+  public Adapter createBz397682CAdapter()
+  {
+    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;
+  }
+
+} // HibernateTestAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
index 4547b85824..c511c6033c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;
 
-import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.*;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient;
@@ -18,6 +17,12 @@ import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Group;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1;
 import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage;
 
 import org.eclipse.emf.ecore.EObject;
@@ -37,343 +42,392 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage
  * @generated
  */
-public class HibernateTestSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static HibernateTestPackage modelPackage;
+public class HibernateTestSwitch<T> extends Switch<T>
+{
+  /**
+   * The cached model package
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static HibernateTestPackage modelPackage;
 
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HibernateTestSwitch() {
-		if (modelPackage == null) {
-			modelPackage = HibernateTestPackage.eINSTANCE;
-		}
-	}
+  /**
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public HibernateTestSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = HibernateTestPackage.eINSTANCE;
+    }
+  }
 
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
+  /**
+   * Checks whether this is a switch for the given package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @parameter ePackage the package in question.
+   * @return whether this is a switch for the given package.
+   * @generated
+   */
+  @Override
+  protected boolean isSwitchFor(EPackage ePackage)
+  {
+    return ePackage == modelPackage;
+  }
 
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case HibernateTestPackage.BZ356181_MAIN: {
-				Bz356181_Main bz356181_Main = (Bz356181_Main)theEObject;
-				T result = caseBz356181_Main(bz356181_Main);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ356181_TRANSIENT: {
-				Bz356181_Transient bz356181_Transient = (Bz356181_Transient)theEObject;
-				T result = caseBz356181_Transient(bz356181_Transient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ356181_NON_TRANSIENT: {
-				Bz356181_NonTransient bz356181_NonTransient = (Bz356181_NonTransient)theEObject;
-				T result = caseBz356181_NonTransient(bz356181_NonTransient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ387752_MAIN: {
-				Bz387752_Main bz387752_Main = (Bz387752_Main)theEObject;
-				T result = caseBz387752_Main(bz387752_Main);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ380987_GROUP: {
-				Bz380987_Group bz380987_Group = (Bz380987_Group)theEObject;
-				T result = caseBz380987_Group(bz380987_Group);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ380987_PLACE: {
-				Bz380987_Place bz380987_Place = (Bz380987_Place)theEObject;
-				T result = caseBz380987_Place(bz380987_Place);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ380987_PERSON: {
-				Bz380987_Person bz380987_Person = (Bz380987_Person)theEObject;
-				T result = caseBz380987_Person(bz380987_Person);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ398057_A: {
-				Bz398057A bz398057A = (Bz398057A)theEObject;
-				T result = caseBz398057A(bz398057A);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ398057_A1: {
-				Bz398057A1 bz398057A1 = (Bz398057A1)theEObject;
-				T result = caseBz398057A1(bz398057A1);
-				if (result == null) result = caseBz398057A(bz398057A1);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ398057_B: {
-				Bz398057B bz398057B = (Bz398057B)theEObject;
-				T result = caseBz398057B(bz398057B);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ398057_B1: {
-				Bz398057B1 bz398057B1 = (Bz398057B1)theEObject;
-				T result = caseBz398057B1(bz398057B1);
-				if (result == null) result = caseBz398057B(bz398057B1);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ397682_P: {
-				Bz397682P bz397682P = (Bz397682P)theEObject;
-				T result = caseBz397682P(bz397682P);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HibernateTestPackage.BZ397682_C: {
-				Bz397682C bz397682C = (Bz397682C)theEObject;
-				T result = caseBz397682C(bz397682C);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(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
+   */
+  @Override
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+    case HibernateTestPackage.BZ356181_MAIN:
+    {
+      Bz356181_Main bz356181_Main = (Bz356181_Main)theEObject;
+      T result = caseBz356181_Main(bz356181_Main);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ356181_TRANSIENT:
+    {
+      Bz356181_Transient bz356181_Transient = (Bz356181_Transient)theEObject;
+      T result = caseBz356181_Transient(bz356181_Transient);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ356181_NON_TRANSIENT:
+    {
+      Bz356181_NonTransient bz356181_NonTransient = (Bz356181_NonTransient)theEObject;
+      T result = caseBz356181_NonTransient(bz356181_NonTransient);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ387752_MAIN:
+    {
+      Bz387752_Main bz387752_Main = (Bz387752_Main)theEObject;
+      T result = caseBz387752_Main(bz387752_Main);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ380987_GROUP:
+    {
+      Bz380987_Group bz380987_Group = (Bz380987_Group)theEObject;
+      T result = caseBz380987_Group(bz380987_Group);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ380987_PLACE:
+    {
+      Bz380987_Place bz380987_Place = (Bz380987_Place)theEObject;
+      T result = caseBz380987_Place(bz380987_Place);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ380987_PERSON:
+    {
+      Bz380987_Person bz380987_Person = (Bz380987_Person)theEObject;
+      T result = caseBz380987_Person(bz380987_Person);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ398057_A:
+    {
+      Bz398057A bz398057A = (Bz398057A)theEObject;
+      T result = caseBz398057A(bz398057A);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ398057_A1:
+    {
+      Bz398057A1 bz398057A1 = (Bz398057A1)theEObject;
+      T result = caseBz398057A1(bz398057A1);
+      if (result == null)
+        result = caseBz398057A(bz398057A1);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ398057_B:
+    {
+      Bz398057B bz398057B = (Bz398057B)theEObject;
+      T result = caseBz398057B(bz398057B);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ398057_B1:
+    {
+      Bz398057B1 bz398057B1 = (Bz398057B1)theEObject;
+      T result = caseBz398057B1(bz398057B1);
+      if (result == null)
+        result = caseBz398057B(bz398057B1);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ397682_P:
+    {
+      Bz397682P bz397682P = (Bz397682P)theEObject;
+      T result = caseBz397682P(bz397682P);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case HibernateTestPackage.BZ397682_C:
+    {
+      Bz397682C bz397682C = (Bz397682C)theEObject;
+      T result = caseBz397682C(bz397682C);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    default:
+      return defaultCase(theEObject);
+    }
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz356181 Main</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz356181 Main</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz356181_Main(Bz356181_Main object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz356181 Main</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz356181 Main</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz356181_Main(Bz356181_Main object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz356181 Transient</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz356181 Transient</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz356181_Transient(Bz356181_Transient object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz356181 Transient</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz356181 Transient</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz356181_Transient(Bz356181_Transient object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz356181 Non Transient</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz356181 Non Transient</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz356181_NonTransient(Bz356181_NonTransient object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz356181 Non Transient</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz356181 Non Transient</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz356181_NonTransient(Bz356181_NonTransient object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz387752 Main</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz387752 Main</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz387752_Main(Bz387752_Main object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz387752 Main</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz387752 Main</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz387752_Main(Bz387752_Main object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz380987 Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz380987 Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz380987_Group(Bz380987_Group object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz380987 Group</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz380987 Group</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz380987_Group(Bz380987_Group object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz380987 Place</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz380987 Place</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz380987_Place(Bz380987_Place object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz380987 Place</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz380987 Place</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz380987_Place(Bz380987_Place object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz380987 Person</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz380987 Person</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz380987_Person(Bz380987_Person object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz380987 Person</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz380987 Person</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz380987_Person(Bz380987_Person object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz398057 A</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz398057 A</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz398057A(Bz398057A object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz398057 A</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz398057 A</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz398057A(Bz398057A object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz398057 A1</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz398057 A1</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz398057A1(Bz398057A1 object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz398057 A1</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz398057 A1</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz398057A1(Bz398057A1 object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz398057 B</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz398057 B</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz398057B(Bz398057B object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz398057 B</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz398057 B</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz398057B(Bz398057B object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz398057 B1</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz398057 B1</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz398057B1(Bz398057B1 object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz398057 B1</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz398057 B1</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz398057B1(Bz398057B1 object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz397682 P</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz397682 P</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz397682P(Bz397682P object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz397682 P</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz397682 P</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz397682P(Bz397682P object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bz397682 C</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bz397682 C</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBz397682C(Bz397682C object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Bz397682 C</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bz397682 C</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBz397682C(Bz397682C object)
+  {
+    return null;
+  }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch, but this is the last case anyway.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
+  @Override
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
 
-} //HibernateTestSwitch
+} // HibernateTestSwitch