model6

57 files changed, 3664 insertions, 343 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
index e76b0499ab..fa0c070504 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
@@ -7,20 +7,21 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.legacy.model6;version="4.0.0";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
- org.eclipse.emf.cdo.tests.legacy.model6.impl;version="4.0.0";
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.cdo.tests.legacy.model6,
-   org.eclipse.emf.common.notify,
-   org.eclipse.emf.ecore.impl",
- org.eclipse.emf.cdo.tests.model6;version="4.0.100";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+Export-Package: org.eclipse.emf.cdo.tests.model6;version="4.0.100";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
  org.eclipse.emf.cdo.tests.model6.impl;version="4.0.100";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.util,
    org.eclipse.emf.internal.cdo,
    org.eclipse.emf.ecore.impl,
    org.eclipse.emf.cdo.tests.model6",
+ org.eclipse.emf.cdo.tests.model6.legacy;version="4.0.100";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.eclipse.emf.cdo.tests.model6.legacy.impl;version="4.0.100";
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.cdo.tests.legacy.model6,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.ecore.impl",
+ org.eclipse.emf.cdo.tests.model6.legacy.util;version="4.0.100",
  org.eclipse.emf.cdo.tests.model6.util;version="4.0.100";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.notify.impl,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel
index 08e8764ce3..9641098598 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel
@@ -7,8 +7,9 @@
   <foreignModel>model6.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model6" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
-      classPackageSuffix="impl.legacy" literalsInterface="false" extensibleProviderFactory="true"
-      childCreationExtenders="true" ecorePackage="model6.ecore#/">
+      metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util"
+      literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="model6.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="model6.ecore#//MyEnum">
       <genEnumLiterals ecoreEnumLiteral="model6.ecore#//MyEnum/ZERO"/>
       <genEnumLiterals ecoreEnumLiteral="model6.ecore#//MyEnum/ONE"/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java
deleted file mode 100644
index c812c2168b..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.legacy.model6;
-
-/**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
- * the model. <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.legacy.model6.Model6Package
- * @generated NOT
- */
-public interface Model6Factory extends org.eclipse.emf.cdo.tests.model6.Model6Factory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6FactoryImpl.init();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  Model6Package getModel6Package();
-
-} // Model6Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java
deleted file mode 100644
index 00a5f14a93..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Package.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.tests.legacy.model6;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.legacy.model6.Model6Factory
- * @model kind="package"
- * @generated NOT
- */
-public interface Model6Package extends org.eclipse.emf.cdo.tests.model6.Model6Package
-{
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated NOT
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model6/1.0.0";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl.init();
-
-  /**
-   * 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
-   */
-  Model6Factory getModel6Factory();
-
-} // Model6Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java
index fc3eeb35db..51596e7796 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getA()
  * @model
  * @generated
  */
@@ -40,7 +40,7 @@ public interface A extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Owned Ds</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA_OwnedDs()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getA_OwnedDs()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
@@ -56,7 +56,7 @@ public interface A extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Owned Bs</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getA_OwnedBs()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getA_OwnedBs()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java
index eaf33bd87f..a908d08cf3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getB()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getB()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
index fa534eeb43..9fe196fa7c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject()
  * @model
  * @generated
  */
@@ -41,7 +41,7 @@ public interface BaseObject extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Attribute Optional</em>' attribute.
    * @see #setAttributeOptional(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeOptional()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject_AttributeOptional()
    * @model
    * @generated
    */
@@ -66,7 +66,7 @@ public interface BaseObject extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Attribute Required</em>' attribute.
    * @see #setAttributeRequired(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeRequired()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject_AttributeRequired()
    * @model required="true"
    * @generated
    */
@@ -91,7 +91,7 @@ public interface BaseObject extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Attribute List</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeList()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getBaseObject_AttributeList()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java
index eca1dda471..db4678b09e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- begin-user-doc --> A representation of the model object '<em><b>C</b></em>'. <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getC()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getC()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
index fd2deaa798..3177915cb9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
@@ -39,7 +39,7 @@ public interface ContainmentObject extends BaseObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Containment Optional</em>' containment reference.
    * @see #setContainmentOptional(BaseObject)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentOptional()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getContainmentObject_ContainmentOptional()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
@@ -64,7 +64,7 @@ public interface ContainmentObject extends BaseObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Containment List</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentList()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getContainmentObject_ContainmentList()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java
index b8be2f1591..62faf36b8e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getD()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getD()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface D extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Data</em>' containment reference.
    * @see #setData(EObject)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getD_Data()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getD_Data()
    * @model containment="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java
index 4493889f3c..82171ff5f2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getE()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getE()
  * @model
  * @generated
  */
@@ -39,7 +39,7 @@ public interface E extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Owned As</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getE_OwnedAs()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getE_OwnedAs()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java
index 936d7adf94..a1c842b4a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getF()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getF()
  * @model
  * @generated
  */
@@ -39,7 +39,7 @@ public interface F extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Owned Es</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getF_OwnedEs()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getF_OwnedEs()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java
index 0040060090..aef5a3292d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java
@@ -30,7 +30,7 @@ import java.util.List;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG()
  * @model
  * @generated
  */
@@ -46,7 +46,7 @@ public interface G extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Dummy</em>' attribute.
    * @see #setDummy(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG_Dummy()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG_Dummy()
    * @model required="true"
    * @generated
    */
@@ -72,7 +72,7 @@ public interface G extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Reference</em>' reference.
    * @see #setReference(BaseObject)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG_Reference()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG_Reference()
    * @model required="true"
    * @generated
    */
@@ -98,7 +98,7 @@ public interface G extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>List</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getG_List()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getG_List()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java
index 6583cd066f..bb3767f8df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/HasNillableAttribute.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHasNillableAttribute()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHasNillableAttribute()
  * @model
  * @generated
  */
@@ -34,7 +34,7 @@ public interface HasNillableAttribute extends EObject
    * @see #isSetNillable()
    * @see #unsetNillable()
    * @see #setNillable(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHasNillableAttribute_Nillable()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHasNillableAttribute_Nillable()
    * @model unsettable="true" dataType="org.eclipse.emf.cdo.tests.model6.MyString"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java
index 59c1a703cf..9856d6b787 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holdable.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHoldable()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHoldable()
  * @model abstract="true"
  * @generated
  */
@@ -32,7 +32,7 @@ public interface Holdable extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHoldable_Name()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHoldable_Name()
    * @model required="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java
index d51c94f04c..8aea25cbb0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Holder.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.EList;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHolder()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHolder()
  * @model
  * @generated
  */
@@ -33,7 +33,7 @@ public interface Holder extends Holdable
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Held</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHolder_Held()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHolder_Held()
    * @model transient="true" derived="true"
    *        annotation="http://www.eclipse.org/emf/CDO persistent='true' filter='owned'"
    * @generated
@@ -50,7 +50,7 @@ public interface Holder extends Holdable
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Owned</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getHolder_Owned()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getHolder_Owned()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
index c574093ae0..df50674143 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
@@ -25,7 +25,7 @@ public interface Model6Factory extends EFactory
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6FactoryImpl.init();
+  Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6FactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Root</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
index 0ca81a3a03..74f687f2dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
@@ -58,7 +58,7 @@ public interface Model6Package extends EPackage
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl.init();
+  Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl.init();
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class. <!--
@@ -115,10 +115,10 @@ public interface Model6Package extends EPackage
   int ROOT_FEATURE_COUNT = 4;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.BaseObjectImpl <em>Base Object</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.BaseObjectImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getBaseObject()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()
    * @generated
    */
   int BASE_OBJECT = 1;
@@ -160,10 +160,10 @@ public interface Model6Package extends EPackage
   int BASE_OBJECT_FEATURE_COUNT = 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.ReferenceObjectImpl <em>Reference Object</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.ReferenceObjectImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getReferenceObject()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()
    * @generated
    */
   int REFERENCE_OBJECT = 2;
@@ -223,10 +223,10 @@ public interface Model6Package extends EPackage
   int REFERENCE_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.ContainmentObjectImpl <em>Containment Object</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.ContainmentObjectImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getContainmentObject()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()
    * @generated
    */
   int CONTAINMENT_OBJECT = 3;
@@ -286,10 +286,10 @@ public interface Model6Package extends EPackage
   int CONTAINMENT_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.UnorderedListImpl <em>Unordered List</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.UnorderedListImpl <em>Unordered List</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.UnorderedListImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getUnorderedList()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.UnorderedListImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getUnorderedList()
    * @generated
    */
   int UNORDERED_LIST = 4;
@@ -321,11 +321,11 @@ public interface Model6Package extends EPackage
   int UNORDERED_LIST_FEATURE_COUNT = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.PropertiesMapImpl <em>Properties Map</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapImpl <em>Properties Map</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.PropertiesMapImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getPropertiesMap()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getPropertiesMap()
    * @generated
    */
   int PROPERTIES_MAP = 5;
@@ -367,11 +367,11 @@ public interface Model6Package extends EPackage
   int PROPERTIES_MAP_FEATURE_COUNT = 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.PropertiesMapEntryImpl <em>Properties Map Entry</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryImpl <em>Properties Map Entry</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.PropertiesMapEntryImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getPropertiesMapEntry()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getPropertiesMapEntry()
    * @generated
    */
   int PROPERTIES_MAP_ENTRY = 6;
@@ -404,11 +404,11 @@ public interface Model6Package extends EPackage
   int PROPERTIES_MAP_ENTRY_FEATURE_COUNT = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.PropertiesMapEntryValueImpl <em>Properties Map Entry Value</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryValueImpl <em>Properties Map Entry Value</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.PropertiesMapEntryValueImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getPropertiesMapEntryValue()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryValueImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getPropertiesMapEntryValue()
    * @generated
    */
   int PROPERTIES_MAP_ENTRY_VALUE = 7;
@@ -593,11 +593,11 @@ public interface Model6Package extends EPackage
   int F_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.GImpl <em>G</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.GImpl <em>G</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.GImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getG()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.GImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getG()
    * @generated
    */
   int G = 14;
@@ -639,11 +639,11 @@ public interface Model6Package extends EPackage
   int G_FEATURE_COUNT = 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.MyEnumListImpl <em>My Enum List</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.MyEnumListImpl <em>My Enum List</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.MyEnumListImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getMyEnumList()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.MyEnumListImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnumList()
    * @generated
    */
   int MY_ENUM_LIST = 15;
@@ -667,11 +667,11 @@ public interface Model6Package extends EPackage
   int MY_ENUM_LIST_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.MyEnumListUnsettableImpl <em>My Enum List Unsettable</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.MyEnumListUnsettableImpl <em>My Enum List Unsettable</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.MyEnumListUnsettableImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getMyEnumListUnsettable()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.MyEnumListUnsettableImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnumListUnsettable()
    * @generated
    */
   int MY_ENUM_LIST_UNSETTABLE = 16;
@@ -695,11 +695,11 @@ public interface Model6Package extends EPackage
   int MY_ENUM_LIST_UNSETTABLE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.HoldableImpl <em>Holdable</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.HoldableImpl <em>Holdable</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.HoldableImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getHoldable()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.HoldableImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getHoldable()
    * @generated
    */
   int HOLDABLE = 19;
@@ -723,11 +723,11 @@ public interface Model6Package extends EPackage
   int HOLDABLE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.HolderImpl <em>Holder</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.HolderImpl <em>Holder</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.HolderImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getHolder()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.HolderImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getHolder()
    * @generated
    */
   int HOLDER = 17;
@@ -769,11 +769,11 @@ public interface Model6Package extends EPackage
   int HOLDER_FEATURE_COUNT = HOLDABLE_FEATURE_COUNT + 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.ThingImpl <em>Thing</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ThingImpl <em>Thing</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.ThingImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getThing()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.ThingImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getThing()
    * @generated
    */
   int THING = 18;
@@ -797,11 +797,11 @@ public interface Model6Package extends EPackage
   int THING_FEATURE_COUNT = HOLDABLE_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.legacy.HasNillableAttributeImpl <em>Has Nillable Attribute</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.HasNillableAttributeImpl <em>Has Nillable Attribute</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.HasNillableAttributeImpl
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getHasNillableAttribute()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.HasNillableAttributeImpl
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getHasNillableAttribute()
    * @generated
    */
   int HAS_NILLABLE_ATTRIBUTE = 20;
@@ -829,7 +829,7 @@ public interface Model6Package extends EPackage
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getMyEnum()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnum()
    * @generated
    */
   int MY_ENUM = 21;
@@ -839,7 +839,7 @@ public interface Model6Package extends EPackage
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @see java.lang.String
-   * @see org.eclipse.emf.cdo.tests.model6.impl.legacy.Model6PackageImpl#getMyString()
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyString()
    * @generated
    */
   int MY_STRING = 22;
@@ -1446,4 +1446,522 @@ public interface Model6Package extends EPackage
    */
   Model6Factory getModel6Factory();
 
+  /**
+   * <!-- 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.model6.impl.RootImpl <em>Root</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()
+     * @generated
+     */
+    EClass ROOT = eINSTANCE.getRoot();
+
+    /**
+     * The meta object literal for the '<em><b>List A</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference ROOT__LIST_A = eINSTANCE.getRoot_ListA();
+
+    /**
+     * The meta object literal for the '<em><b>List B</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference ROOT__LIST_B = eINSTANCE.getRoot_ListB();
+
+    /**
+     * The meta object literal for the '<em><b>List C</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference ROOT__LIST_C = eINSTANCE.getRoot_ListC();
+
+    /**
+     * The meta object literal for the '<em><b>List D</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference ROOT__LIST_D = eINSTANCE.getRoot_ListD();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()
+     * @generated
+     */
+    EClass BASE_OBJECT = eINSTANCE.getBaseObject();
+
+    /**
+     * The meta object literal for the '<em><b>Attribute Optional</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BASE_OBJECT__ATTRIBUTE_OPTIONAL = eINSTANCE.getBaseObject_AttributeOptional();
+
+    /**
+     * The meta object literal for the '<em><b>Attribute Required</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BASE_OBJECT__ATTRIBUTE_REQUIRED = eINSTANCE.getBaseObject_AttributeRequired();
+
+    /**
+     * The meta object literal for the '<em><b>Attribute List</b></em>' attribute list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute BASE_OBJECT__ATTRIBUTE_LIST = eINSTANCE.getBaseObject_AttributeList();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()
+     * @generated
+     */
+    EClass REFERENCE_OBJECT = eINSTANCE.getReferenceObject();
+
+    /**
+     * The meta object literal for the '<em><b>Reference Optional</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference REFERENCE_OBJECT__REFERENCE_OPTIONAL = eINSTANCE.getReferenceObject_ReferenceOptional();
+
+    /**
+     * The meta object literal for the '<em><b>Reference List</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference REFERENCE_OBJECT__REFERENCE_LIST = eINSTANCE.getReferenceObject_ReferenceList();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()
+     * @generated
+     */
+    EClass CONTAINMENT_OBJECT = eINSTANCE.getContainmentObject();
+
+    /**
+     * The meta object literal for the '<em><b>Containment Optional</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = eINSTANCE.getContainmentObject_ContainmentOptional();
+
+    /**
+     * The meta object literal for the '<em><b>Containment List</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference CONTAINMENT_OBJECT__CONTAINMENT_LIST = eINSTANCE.getContainmentObject_ContainmentList();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.UnorderedListImpl <em>Unordered List</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.UnorderedListImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getUnorderedList()
+     * @generated
+     */
+    EClass UNORDERED_LIST = eINSTANCE.getUnorderedList();
+
+    /**
+     * The meta object literal for the '<em><b>Contained</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference UNORDERED_LIST__CONTAINED = eINSTANCE.getUnorderedList_Contained();
+
+    /**
+     * The meta object literal for the '<em><b>Referenced</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference UNORDERED_LIST__REFERENCED = eINSTANCE.getUnorderedList_Referenced();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapImpl <em>Properties Map</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getPropertiesMap()
+     * @generated
+     */
+    EClass PROPERTIES_MAP = eINSTANCE.getPropertiesMap();
+
+    /**
+     * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute PROPERTIES_MAP__LABEL = eINSTANCE.getPropertiesMap_Label();
+
+    /**
+     * The meta object literal for the '<em><b>Persistent Map</b></em>' map feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference PROPERTIES_MAP__PERSISTENT_MAP = eINSTANCE.getPropertiesMap_PersistentMap();
+
+    /**
+     * The meta object literal for the '<em><b>Transient Map</b></em>' map feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference PROPERTIES_MAP__TRANSIENT_MAP = eINSTANCE.getPropertiesMap_TransientMap();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryImpl <em>Properties Map Entry</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getPropertiesMapEntry()
+     * @generated
+     */
+    EClass PROPERTIES_MAP_ENTRY = eINSTANCE.getPropertiesMapEntry();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute PROPERTIES_MAP_ENTRY__KEY = eINSTANCE.getPropertiesMapEntry_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference PROPERTIES_MAP_ENTRY__VALUE = eINSTANCE.getPropertiesMapEntry_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryValueImpl <em>Properties Map Entry Value</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.PropertiesMapEntryValueImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getPropertiesMapEntryValue()
+     * @generated
+     */
+    EClass PROPERTIES_MAP_ENTRY_VALUE = eINSTANCE.getPropertiesMapEntryValue();
+
+    /**
+     * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute PROPERTIES_MAP_ENTRY_VALUE__LABEL = eINSTANCE.getPropertiesMapEntryValue_Label();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.AImpl <em>A</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.AImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getA()
+     * @generated
+     */
+    EClass A = eINSTANCE.getA();
+
+    /**
+     * The meta object literal for the '<em><b>Owned Ds</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference A__OWNED_DS = eINSTANCE.getA_OwnedDs();
+
+    /**
+     * The meta object literal for the '<em><b>Owned Bs</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference A__OWNED_BS = eINSTANCE.getA_OwnedBs();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BImpl <em>B</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.BImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getB()
+     * @generated
+     */
+    EClass B = eINSTANCE.getB();
+
+    /**
+     * The meta object literal for the '<em><b>Owned C</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference B__OWNED_C = eINSTANCE.getB_OwnedC();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.CImpl <em>C</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.CImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getC()
+     * @generated
+     */
+    EClass C = eINSTANCE.getC();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.DImpl <em>D</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.DImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getD()
+     * @generated
+     */
+    EClass D = eINSTANCE.getD();
+
+    /**
+     * The meta object literal for the '<em><b>Data</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference D__DATA = eINSTANCE.getD_Data();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.EImpl <em>E</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.EImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getE()
+     * @generated
+     */
+    EClass E = eINSTANCE.getE();
+
+    /**
+     * The meta object literal for the '<em><b>Owned As</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference E__OWNED_AS = eINSTANCE.getE_OwnedAs();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.FImpl <em>F</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.FImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getF()
+     * @generated
+     */
+    EClass F = eINSTANCE.getF();
+
+    /**
+     * The meta object literal for the '<em><b>Owned Es</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference F__OWNED_ES = eINSTANCE.getF_OwnedEs();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.GImpl <em>G</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.GImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getG()
+     * @generated
+     */
+    EClass G = eINSTANCE.getG();
+
+    /**
+     * The meta object literal for the '<em><b>Dummy</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute G__DUMMY = eINSTANCE.getG_Dummy();
+
+    /**
+     * The meta object literal for the '<em><b>Reference</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference G__REFERENCE = eINSTANCE.getG_Reference();
+
+    /**
+     * The meta object literal for the '<em><b>List</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference G__LIST = eINSTANCE.getG_List();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.MyEnumListImpl <em>My Enum List</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.MyEnumListImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnumList()
+     * @generated
+     */
+    EClass MY_ENUM_LIST = eINSTANCE.getMyEnumList();
+
+    /**
+     * The meta object literal for the '<em><b>My Enum</b></em>' attribute list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute MY_ENUM_LIST__MY_ENUM = eINSTANCE.getMyEnumList_MyEnum();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.MyEnumListUnsettableImpl <em>My Enum List Unsettable</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.MyEnumListUnsettableImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnumListUnsettable()
+     * @generated
+     */
+    EClass MY_ENUM_LIST_UNSETTABLE = eINSTANCE.getMyEnumListUnsettable();
+
+    /**
+     * The meta object literal for the '<em><b>My Enum</b></em>' attribute list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute MY_ENUM_LIST_UNSETTABLE__MY_ENUM = eINSTANCE.getMyEnumListUnsettable_MyEnum();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.HolderImpl <em>Holder</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.HolderImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getHolder()
+     * @generated
+     */
+    EClass HOLDER = eINSTANCE.getHolder();
+
+    /**
+     * The meta object literal for the '<em><b>Held</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference HOLDER__HELD = eINSTANCE.getHolder_Held();
+
+    /**
+     * The meta object literal for the '<em><b>Owned</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference HOLDER__OWNED = eINSTANCE.getHolder_Owned();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ThingImpl <em>Thing</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.ThingImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getThing()
+     * @generated
+     */
+    EClass THING = eINSTANCE.getThing();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.HoldableImpl <em>Holdable</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.HoldableImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getHoldable()
+     * @generated
+     */
+    EClass HOLDABLE = eINSTANCE.getHoldable();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute HOLDABLE__NAME = eINSTANCE.getHoldable_Name();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.HasNillableAttributeImpl <em>Has Nillable Attribute</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.impl.HasNillableAttributeImpl
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getHasNillableAttribute()
+     * @generated
+     */
+    EClass HAS_NILLABLE_ATTRIBUTE = eINSTANCE.getHasNillableAttribute();
+
+    /**
+     * The meta object literal for the '<em><b>Nillable</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute HAS_NILLABLE_ATTRIBUTE__NILLABLE = eINSTANCE.getHasNillableAttribute_Nillable();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnum()
+     * @generated
+     */
+    EEnum MY_ENUM = eINSTANCE.getMyEnum();
+
+    /**
+     * The meta object literal for the '<em>My String</em>' data type.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see java.lang.String
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyString()
+     * @generated
+     */
+    EDataType MY_STRING = eINSTANCE.getMyString();
+
+  }
+
 } // Model6Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java
index bbd6d2de5d..1090a83579 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java
@@ -21,7 +21,7 @@ import java.util.List;
  * A representation of the literals of the enumeration '<em><b>My Enum</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnum()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnum()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java
index bd17efd85c..d5e6caeed3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumList()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumList()
  * @model
  * @generated
  */
@@ -43,7 +43,7 @@ public interface MyEnumList extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>My Enum</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumList_MyEnum()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumList_MyEnum()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java
index 6fd33f9361..0a05167c8b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumListUnsettable()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumListUnsettable()
  * @model
  * @generated
  */
@@ -45,7 +45,7 @@ public interface MyEnumListUnsettable extends EObject
    * @see org.eclipse.emf.cdo.tests.model6.MyEnum
    * @see #isSetMyEnum()
    * @see #unsetMyEnum()
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getMyEnumListUnsettable_MyEnum()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getMyEnumListUnsettable_MyEnum()
    * @model unsettable="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java
index 45d9a6d6bc..f3d470694f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap()
  * @model
  * @generated
  */
@@ -43,7 +43,7 @@ public interface PropertiesMap extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Label</em>' attribute.
    * @see #setLabel(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap_Label()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap_Label()
    * @model
    * @generated
    */
@@ -70,7 +70,7 @@ public interface PropertiesMap extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Persistent Map</em>' map.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap_PersistentMap()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap_PersistentMap()
    * @model mapType="org.eclipse.emf.cdo.tests.model6.PropertiesMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue>"
    * @generated
    */
@@ -87,7 +87,7 @@ public interface PropertiesMap extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Transient Map</em>' map.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMap_TransientMap()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMap_TransientMap()
    * @model mapType="org.eclipse.emf.cdo.tests.model6.PropertiesMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue>" transient="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java
index 9aac0e4187..0abf4b8a8d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMapEntryValue()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMapEntryValue()
  * @model
  * @generated
  */
@@ -40,7 +40,7 @@ public interface PropertiesMapEntryValue extends EObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Label</em>' attribute.
    * @see #setLabel(String)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getPropertiesMapEntryValue_Label()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getPropertiesMapEntryValue_Label()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
index 852f1c78f3..1da11ce08e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
@@ -39,7 +39,7 @@ public interface ReferenceObject extends BaseObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Reference Optional</em>' reference.
    * @see #setReferenceOptional(BaseObject)
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceOptional()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getReferenceObject_ReferenceOptional()
    * @model
    * @generated
    */
@@ -64,7 +64,7 @@ public interface ReferenceObject extends BaseObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Reference List</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceList()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getReferenceObject_ReferenceList()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
index 1c0c2c3b60..4a0c401801 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot()
  * @model
  * @generated
  */
@@ -42,7 +42,7 @@ public interface Root extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>List A</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListA()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListA()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
@@ -58,7 +58,7 @@ public interface Root extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>List B</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListB()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListB()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
@@ -74,7 +74,7 @@ public interface Root extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>List C</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListC()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListC()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
@@ -90,7 +90,7 @@ public interface Root extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>List D</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListD()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getRoot_ListD()
    * @model containment="true" resolveProxies="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java
index 628d626eef..18d5ad75d7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Thing.java
@@ -8,7 +8,7 @@ package org.eclipse.emf.cdo.tests.model6;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getThing()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getThing()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java
index 3dcb6e32a9..249d5ea314 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getUnorderedList()
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getUnorderedList()
  * @model
  * @generated
  */
@@ -40,7 +40,7 @@ public interface UnorderedList extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Contained</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getUnorderedList_Contained()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getUnorderedList_Contained()
    * @model containment="true" resolveProxies="true" ordered="false"
    * @generated
    */
@@ -56,7 +56,7 @@ public interface UnorderedList extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Referenced</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getUnorderedList_Referenced()
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package#getUnorderedList_Referenced()
    * @model ordered="false"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java
new file mode 100644
index 0000000000..30d99739f6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java
@@ -0,0 +1,226 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.model6.legacy;
+
+import org.eclipse.emf.cdo.tests.model6.A;
+import org.eclipse.emf.cdo.tests.model6.B;
+import org.eclipse.emf.cdo.tests.model6.BaseObject;
+import org.eclipse.emf.cdo.tests.model6.C;
+import org.eclipse.emf.cdo.tests.model6.ContainmentObject;
+import org.eclipse.emf.cdo.tests.model6.D;
+import org.eclipse.emf.cdo.tests.model6.E;
+import org.eclipse.emf.cdo.tests.model6.F;
+import org.eclipse.emf.cdo.tests.model6.G;
+import org.eclipse.emf.cdo.tests.model6.HasNillableAttribute;
+import org.eclipse.emf.cdo.tests.model6.Holder;
+import org.eclipse.emf.cdo.tests.model6.MyEnumList;
+import org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable;
+import org.eclipse.emf.cdo.tests.model6.PropertiesMap;
+import org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue;
+import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
+import org.eclipse.emf.cdo.tests.model6.Root;
+import org.eclipse.emf.cdo.tests.model6.Thing;
+import org.eclipse.emf.cdo.tests.model6.UnorderedList;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * @extends org.eclipse.emf.cdo.tests.model6.Model6Factory
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package
+ * @generated
+ */
+public interface Model6Factory extends EFactory, org.eclipse.emf.cdo.tests.model6.Model6Factory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6FactoryImpl.init();
+
+  /**
+   * Returns a new object of class '<em>Root</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Root</em>'.
+   * @generated
+   */
+  Root createRoot();
+
+  /**
+   * Returns a new object of class '<em>Base Object</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Base Object</em>'.
+   * @generated
+   */
+  BaseObject createBaseObject();
+
+  /**
+   * Returns a new object of class '<em>Reference Object</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Reference Object</em>'.
+   * @generated
+   */
+  ReferenceObject createReferenceObject();
+
+  /**
+   * Returns a new object of class '<em>Containment Object</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Containment Object</em>'.
+   * @generated
+   */
+  ContainmentObject createContainmentObject();
+
+  /**
+   * Returns a new object of class '<em>Unordered List</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Unordered List</em>'.
+   * @generated
+   */
+  UnorderedList createUnorderedList();
+
+  /**
+   * Returns a new object of class '<em>Properties Map</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Properties Map</em>'.
+   * @generated
+   */
+  PropertiesMap createPropertiesMap();
+
+  /**
+   * Returns a new object of class '<em>Properties Map Entry Value</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Properties Map Entry Value</em>'.
+   * @generated
+   */
+  PropertiesMapEntryValue createPropertiesMapEntryValue();
+
+  /**
+   * Returns a new object of class '<em>A</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>A</em>'.
+   * @generated
+   */
+  A createA();
+
+  /**
+   * Returns a new object of class '<em>B</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>B</em>'.
+   * @generated
+   */
+  B createB();
+
+  /**
+   * Returns a new object of class '<em>C</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>C</em>'.
+   * @generated
+   */
+  C createC();
+
+  /**
+   * Returns a new object of class '<em>D</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>D</em>'.
+   * @generated
+   */
+  D createD();
+
+  /**
+   * Returns a new object of class '<em>E</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>E</em>'.
+   * @generated
+   */
+  E createE();
+
+  /**
+   * Returns a new object of class '<em>F</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>F</em>'.
+   * @generated
+   */
+  F createF();
+
+  /**
+   * Returns a new object of class '<em>G</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>G</em>'.
+   * @generated
+   */
+  G createG();
+
+  /**
+   * Returns a new object of class '<em>My Enum List</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>My Enum List</em>'.
+   * @generated
+   */
+  MyEnumList createMyEnumList();
+
+  /**
+   * Returns a new object of class '<em>My Enum List Unsettable</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>My Enum List Unsettable</em>'.
+   * @generated
+   */
+  MyEnumListUnsettable createMyEnumListUnsettable();
+
+  /**
+   * Returns a new object of class '<em>Holder</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Holder</em>'.
+   * @generated
+   */
+  Holder createHolder();
+
+  /**
+   * Returns a new object of class '<em>Thing</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Thing</em>'.
+   * @generated
+   */
+  Thing createThing();
+
+  /**
+   * Returns a new object of class '<em>Has Nillable Attribute</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Has Nillable Attribute</em>'.
+   * @generated
+   */
+  HasNillableAttribute createHasNillableAttribute();
+
+  /**
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the package supported by this factory.
+   * @generated
+   */
+  Model6Package getModel6Package();
+
+} // Model6Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java
new file mode 100644
index 0000000000..02e30e6a7c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java
@@ -0,0 +1,1475 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.model6.legacy;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * @extends org.eclipse.emf.cdo.tests.model6.Model6Package
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Factory
+ * @model kind="package"
+ * @generated
+ */
+public interface Model6Package extends EPackage, org.eclipse.emf.cdo.tests.model6.Model6Package
+{
+  /**
+   * The package name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNAME = "model6";
+
+  /**
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model6/1.0.0";
+
+  /**
+   * The package namespace name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  String eNS_PREFIX = "model6";
+
+  /**
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl.init();
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.RootImpl <em>Root</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.RootImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getRoot()
+   * @generated
+   */
+  int ROOT = 0;
+
+  /**
+   * The feature id for the '<em><b>List A</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ROOT__LIST_A = 0;
+
+  /**
+   * The feature id for the '<em><b>List B</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ROOT__LIST_B = 1;
+
+  /**
+   * The feature id for the '<em><b>List C</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ROOT__LIST_C = 2;
+
+  /**
+   * The feature id for the '<em><b>List D</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ROOT__LIST_D = 3;
+
+  /**
+   * The number of structural features of the '<em>Root</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ROOT_FEATURE_COUNT = 4;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.BaseObjectImpl <em>Base Object</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.BaseObjectImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getBaseObject()
+   * @generated
+   */
+  int BASE_OBJECT = 1;
+
+  /**
+   * The feature id for the '<em><b>Attribute Optional</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BASE_OBJECT__ATTRIBUTE_OPTIONAL = 0;
+
+  /**
+   * The feature id for the '<em><b>Attribute Required</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BASE_OBJECT__ATTRIBUTE_REQUIRED = 1;
+
+  /**
+   * The feature id for the '<em><b>Attribute List</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BASE_OBJECT__ATTRIBUTE_LIST = 2;
+
+  /**
+   * The number of structural features of the '<em>Base Object</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BASE_OBJECT_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.ReferenceObjectImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getReferenceObject()
+   * @generated
+   */
+  int REFERENCE_OBJECT = 2;
+
+  /**
+   * The feature id for the '<em><b>Attribute Optional</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_OBJECT__ATTRIBUTE_OPTIONAL = BASE_OBJECT__ATTRIBUTE_OPTIONAL;
+
+  /**
+   * The feature id for the '<em><b>Attribute Required</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_OBJECT__ATTRIBUTE_REQUIRED = BASE_OBJECT__ATTRIBUTE_REQUIRED;
+
+  /**
+   * The feature id for the '<em><b>Attribute List</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;
+
+  /**
+   * The feature id for the '<em><b>Reference Optional</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_OBJECT__REFERENCE_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Reference List</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_OBJECT__REFERENCE_LIST = BASE_OBJECT_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Reference Object</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.ContainmentObjectImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getContainmentObject()
+   * @generated
+   */
+  int CONTAINMENT_OBJECT = 3;
+
+  /**
+   * The feature id for the '<em><b>Attribute Optional</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONTAINMENT_OBJECT__ATTRIBUTE_OPTIONAL = BASE_OBJECT__ATTRIBUTE_OPTIONAL;
+
+  /**
+   * The feature id for the '<em><b>Attribute Required</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONTAINMENT_OBJECT__ATTRIBUTE_REQUIRED = BASE_OBJECT__ATTRIBUTE_REQUIRED;
+
+  /**
+   * The feature id for the '<em><b>Attribute List</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONTAINMENT_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;
+
+  /**
+   * The feature id for the '<em><b>Containment Optional</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Containment List</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONTAINMENT_OBJECT__CONTAINMENT_LIST = BASE_OBJECT_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Containment Object</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONTAINMENT_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.UnorderedListImpl <em>Unordered List</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.UnorderedListImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getUnorderedList()
+   * @generated
+   */
+  int UNORDERED_LIST = 4;
+
+  /**
+   * The feature id for the '<em><b>Contained</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNORDERED_LIST__CONTAINED = 0;
+
+  /**
+   * The feature id for the '<em><b>Referenced</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNORDERED_LIST__REFERENCED = 1;
+
+  /**
+   * The number of structural features of the '<em>Unordered List</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNORDERED_LIST_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapImpl <em>Properties Map</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getPropertiesMap()
+   * @generated
+   */
+  int PROPERTIES_MAP = 5;
+
+  /**
+   * The feature id for the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP__LABEL = 0;
+
+  /**
+   * The feature id for the '<em><b>Persistent Map</b></em>' map.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP__PERSISTENT_MAP = 1;
+
+  /**
+   * The feature id for the '<em><b>Transient Map</b></em>' map.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP__TRANSIENT_MAP = 2;
+
+  /**
+   * The number of structural features of the '<em>Properties Map</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryImpl <em>Properties Map Entry</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getPropertiesMapEntry()
+   * @generated
+   */
+  int PROPERTIES_MAP_ENTRY = 6;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP_ENTRY__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP_ENTRY__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>Properties Map Entry</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP_ENTRY_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryValueImpl <em>Properties Map Entry Value</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryValueImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getPropertiesMapEntryValue()
+   * @generated
+   */
+  int PROPERTIES_MAP_ENTRY_VALUE = 7;
+
+  /**
+   * The feature id for the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP_ENTRY_VALUE__LABEL = 0;
+
+  /**
+   * The number of structural features of the '<em>Properties Map Entry Value</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int PROPERTIES_MAP_ENTRY_VALUE_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.AImpl <em>A</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.AImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getA()
+   * @generated
+   */
+  int A = 8;
+
+  /**
+   * The feature id for the '<em><b>Owned Ds</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int A__OWNED_DS = 0;
+
+  /**
+   * The feature id for the '<em><b>Owned Bs</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int A__OWNED_BS = 1;
+
+  /**
+   * The number of structural features of the '<em>A</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int A_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.BImpl <em>B</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.BImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getB()
+   * @generated
+   */
+  int B = 9;
+
+  /**
+   * The feature id for the '<em><b>Owned C</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int B__OWNED_C = 0;
+
+  /**
+   * The number of structural features of the '<em>B</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int B_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.CImpl <em>C</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.CImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getC()
+   * @generated
+   */
+  int C = 10;
+
+  /**
+   * The number of structural features of the '<em>C</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int C_FEATURE_COUNT = 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.DImpl <em>D</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.DImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getD()
+   * @generated
+   */
+  int D = 11;
+
+  /**
+   * The feature id for the '<em><b>Data</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int D__DATA = 0;
+
+  /**
+   * The number of structural features of the '<em>D</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int D_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.EImpl <em>E</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.EImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getE()
+   * @generated
+   */
+  int E = 12;
+
+  /**
+   * The feature id for the '<em><b>Owned As</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int E__OWNED_AS = 0;
+
+  /**
+   * The number of structural features of the '<em>E</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int E_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.FImpl <em>F</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.FImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getF()
+   * @generated
+   */
+  int F = 13;
+
+  /**
+   * The feature id for the '<em><b>Owned Es</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int F__OWNED_ES = 0;
+
+  /**
+   * The number of structural features of the '<em>F</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int F_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.GImpl <em>G</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.GImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getG()
+   * @generated
+   */
+  int G = 14;
+
+  /**
+   * The feature id for the '<em><b>Dummy</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int G__DUMMY = 0;
+
+  /**
+   * The feature id for the '<em><b>Reference</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int G__REFERENCE = 1;
+
+  /**
+   * The feature id for the '<em><b>List</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int G__LIST = 2;
+
+  /**
+   * The number of structural features of the '<em>G</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int G_FEATURE_COUNT = 3;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.MyEnumListImpl <em>My Enum List</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.MyEnumListImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getMyEnumList()
+   * @generated
+   */
+  int MY_ENUM_LIST = 15;
+
+  /**
+   * The feature id for the '<em><b>My Enum</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MY_ENUM_LIST__MY_ENUM = 0;
+
+  /**
+   * The number of structural features of the '<em>My Enum List</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MY_ENUM_LIST_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.MyEnumListUnsettableImpl <em>My Enum List Unsettable</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.MyEnumListUnsettableImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getMyEnumListUnsettable()
+   * @generated
+   */
+  int MY_ENUM_LIST_UNSETTABLE = 16;
+
+  /**
+   * The feature id for the '<em><b>My Enum</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MY_ENUM_LIST_UNSETTABLE__MY_ENUM = 0;
+
+  /**
+   * The number of structural features of the '<em>My Enum List Unsettable</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MY_ENUM_LIST_UNSETTABLE_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HoldableImpl <em>Holdable</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.HoldableImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getHoldable()
+   * @generated
+   */
+  int HOLDABLE = 19;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HOLDABLE__NAME = 0;
+
+  /**
+   * The number of structural features of the '<em>Holdable</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HOLDABLE_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HolderImpl <em>Holder</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.HolderImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getHolder()
+   * @generated
+   */
+  int HOLDER = 17;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HOLDER__NAME = HOLDABLE__NAME;
+
+  /**
+   * The feature id for the '<em><b>Held</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HOLDER__HELD = HOLDABLE_FEATURE_COUNT + 0;
+
+  /**
+   * The feature id for the '<em><b>Owned</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HOLDER__OWNED = HOLDABLE_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>Holder</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HOLDER_FEATURE_COUNT = HOLDABLE_FEATURE_COUNT + 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.ThingImpl <em>Thing</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.ThingImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getThing()
+   * @generated
+   */
+  int THING = 18;
+
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int THING__NAME = HOLDABLE__NAME;
+
+  /**
+   * The number of structural features of the '<em>Thing</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int THING_FEATURE_COUNT = HOLDABLE_FEATURE_COUNT + 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HasNillableAttributeImpl <em>Has Nillable Attribute</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.HasNillableAttributeImpl
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getHasNillableAttribute()
+   * @generated
+   */
+  int HAS_NILLABLE_ATTRIBUTE = 20;
+
+  /**
+   * The feature id for the '<em><b>Nillable</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HAS_NILLABLE_ATTRIBUTE__NILLABLE = 0;
+
+  /**
+   * The number of structural features of the '<em>Has Nillable Attribute</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int HAS_NILLABLE_ATTRIBUTE_FEATURE_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getMyEnum()
+   * @generated
+   */
+  int MY_ENUM = 21;
+
+  /**
+   * The meta object id for the '<em>My String</em>' data type.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see java.lang.String
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getMyString()
+   * @generated
+   */
+  int MY_STRING = 22;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Root <em>Root</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Root</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Root
+   * @generated
+   */
+  EClass getRoot();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>List A</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListA()
+   * @see #getRoot()
+   * @generated
+   */
+  EReference getRoot_ListA();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>List B</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListB()
+   * @see #getRoot()
+   * @generated
+   */
+  EReference getRoot_ListB();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>List C</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListC()
+   * @see #getRoot()
+   * @generated
+   */
+  EReference getRoot_ListC();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>List D</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListD()
+   * @see #getRoot()
+   * @generated
+   */
+  EReference getRoot_ListD();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Base Object</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject
+   * @generated
+   */
+  EClass getBaseObject();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Attribute Optional</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional()
+   * @see #getBaseObject()
+   * @generated
+   */
+  EAttribute getBaseObject_AttributeOptional();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Attribute Required</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired()
+   * @see #getBaseObject()
+   * @generated
+   */
+  EAttribute getBaseObject_AttributeRequired();
+
+  /**
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute list '<em>Attribute List</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList()
+   * @see #getBaseObject()
+   * @generated
+   */
+  EAttribute getBaseObject_AttributeList();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject <em>Reference Object</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Reference Object</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject
+   * @generated
+   */
+  EClass getReferenceObject();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Reference Optional</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional()
+   * @see #getReferenceObject()
+   * @generated
+   */
+  EReference getReferenceObject_ReferenceOptional();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Reference List</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList()
+   * @see #getReferenceObject()
+   * @generated
+   */
+  EReference getReferenceObject_ReferenceList();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject <em>Containment Object</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Containment Object</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject
+   * @generated
+   */
+  EClass getContainmentObject();
+
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Containment Optional</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional()
+   * @see #getContainmentObject()
+   * @generated
+   */
+  EReference getContainmentObject_ContainmentOptional();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Containment List</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList()
+   * @see #getContainmentObject()
+   * @generated
+   */
+  EReference getContainmentObject_ContainmentList();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.UnorderedList <em>Unordered List</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Unordered List</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.UnorderedList
+   * @generated
+   */
+  EClass getUnorderedList();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.UnorderedList#getContained <em>Contained</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Contained</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.UnorderedList#getContained()
+   * @see #getUnorderedList()
+   * @generated
+   */
+  EReference getUnorderedList_Contained();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.UnorderedList#getReferenced <em>Referenced</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Referenced</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.UnorderedList#getReferenced()
+   * @see #getUnorderedList()
+   * @generated
+   */
+  EReference getUnorderedList_Referenced();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMap <em>Properties Map</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Properties Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.PropertiesMap
+   * @generated
+   */
+  EClass getPropertiesMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMap#getLabel <em>Label</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Label</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.PropertiesMap#getLabel()
+   * @see #getPropertiesMap()
+   * @generated
+   */
+  EAttribute getPropertiesMap_Label();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMap#getPersistentMap <em>Persistent Map</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the map '<em>Persistent Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.PropertiesMap#getPersistentMap()
+   * @see #getPropertiesMap()
+   * @generated
+   */
+  EReference getPropertiesMap_PersistentMap();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMap#getTransientMap <em>Transient Map</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the map '<em>Transient Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.PropertiesMap#getTransientMap()
+   * @see #getPropertiesMap()
+   * @generated
+   */
+  EReference getPropertiesMap_TransientMap();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>Properties Map Entry</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Properties Map Entry</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString"
+   *        valueType="org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue" valueContainment="true" valueResolveProxies="true"
+   * @generated
+   */
+  EClass getPropertiesMapEntry();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getPropertiesMapEntry()
+   * @generated
+   */
+  EAttribute getPropertiesMapEntry_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getPropertiesMapEntry()
+   * @generated
+   */
+  EReference getPropertiesMapEntry_Value();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue <em>Properties Map Entry Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Properties Map Entry Value</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue
+   * @generated
+   */
+  EClass getPropertiesMapEntryValue();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue#getLabel <em>Label</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Label</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue#getLabel()
+   * @see #getPropertiesMapEntryValue()
+   * @generated
+   */
+  EAttribute getPropertiesMapEntryValue_Label();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.A <em>A</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>A</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.A
+   * @generated
+   */
+  EClass getA();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedDs <em>Owned Ds</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Owned Ds</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.A#getOwnedDs()
+   * @see #getA()
+   * @generated
+   */
+  EReference getA_OwnedDs();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.A#getOwnedBs <em>Owned Bs</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Owned Bs</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.A#getOwnedBs()
+   * @see #getA()
+   * @generated
+   */
+  EReference getA_OwnedBs();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.B <em>B</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>B</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.B
+   * @generated
+   */
+  EClass getB();
+
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.B#getOwnedC <em>Owned C</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Owned C</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.B#getOwnedC()
+   * @see #getB()
+   * @generated
+   */
+  EReference getB_OwnedC();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.C <em>C</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>C</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.C
+   * @generated
+   */
+  EClass getC();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.D <em>D</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>D</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.D
+   * @generated
+   */
+  EClass getD();
+
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.D#getData <em>Data</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Data</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.D#getData()
+   * @see #getD()
+   * @generated
+   */
+  EReference getD_Data();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.E <em>E</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>E</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.E
+   * @generated
+   */
+  EClass getE();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.E#getOwnedAs <em>Owned As</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Owned As</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.E#getOwnedAs()
+   * @see #getE()
+   * @generated
+   */
+  EReference getE_OwnedAs();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.F <em>F</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>F</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.F
+   * @generated
+   */
+  EClass getF();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.F#getOwnedEs <em>Owned Es</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Owned Es</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.F#getOwnedEs()
+   * @see #getF()
+   * @generated
+   */
+  EReference getF_OwnedEs();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.G <em>G</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>G</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.G
+   * @generated
+   */
+  EClass getG();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.G#getDummy <em>Dummy</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Dummy</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.G#getDummy()
+   * @see #getG()
+   * @generated
+   */
+  EAttribute getG_Dummy();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.G#getReference <em>Reference</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Reference</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.G#getReference()
+   * @see #getG()
+   * @generated
+   */
+  EReference getG_Reference();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.G#getList <em>List</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>List</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.G#getList()
+   * @see #getG()
+   * @generated
+   */
+  EReference getG_List();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.MyEnumList <em>My Enum List</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>My Enum List</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnumList
+   * @generated
+   */
+  EClass getMyEnumList();
+
+  /**
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model6.MyEnumList#getMyEnum <em>My Enum</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute list '<em>My Enum</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnumList#getMyEnum()
+   * @see #getMyEnumList()
+   * @generated
+   */
+  EAttribute getMyEnumList_MyEnum();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable <em>My Enum List Unsettable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>My Enum List Unsettable</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable
+   * @generated
+   */
+  EClass getMyEnumListUnsettable();
+
+  /**
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable#getMyEnum <em>My Enum</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute list '<em>My Enum</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable#getMyEnum()
+   * @see #getMyEnumListUnsettable()
+   * @generated
+   */
+  EAttribute getMyEnumListUnsettable_MyEnum();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Holder <em>Holder</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Holder</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Holder
+   * @generated
+   */
+  EClass getHolder();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.Holder#getHeld <em>Held</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Held</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Holder#getHeld()
+   * @see #getHolder()
+   * @generated
+   */
+  EReference getHolder_Held();
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Holder#getOwned <em>Owned</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Owned</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Holder#getOwned()
+   * @see #getHolder()
+   * @generated
+   */
+  EReference getHolder_Owned();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Thing <em>Thing</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Thing</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Thing
+   * @generated
+   */
+  EClass getThing();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Holdable <em>Holdable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Holdable</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.Holdable
+   * @generated
+   */
+  EClass getHoldable();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.Holdable#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.model6.Holdable#getName()
+   * @see #getHoldable()
+   * @generated
+   */
+  EAttribute getHoldable_Name();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.HasNillableAttribute <em>Has Nillable Attribute</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Has Nillable Attribute</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.HasNillableAttribute
+   * @generated
+   */
+  EClass getHasNillableAttribute();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.HasNillableAttribute#getNillable <em>Nillable</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Nillable</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.HasNillableAttribute#getNillable()
+   * @see #getHasNillableAttribute()
+   * @generated
+   */
+  EAttribute getHasNillableAttribute_Nillable();
+
+  /**
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for enum '<em>My Enum</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+   * @generated
+   */
+  EEnum getMyEnum();
+
+  /**
+   * Returns the meta object for data type '{@link java.lang.String <em>My String</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for data type '<em>My String</em>'.
+   * @see java.lang.String
+   * @model instanceClass="java.lang.String"
+   * @generated
+   */
+  EDataType getMyString();
+
+  /**
+   * 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
+   */
+  Model6Factory getModel6Factory();
+
+} // Model6Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/AImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/AImpl.java
index 2598dcb103..6ad1bc31a7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/AImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/AImpl.java
@@ -8,12 +8,12 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.A;
 import org.eclipse.emf.cdo.tests.model6.B;
 import org.eclipse.emf.cdo.tests.model6.D;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -30,8 +30,8 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.AImpl#getOwnedDs <em>Owned Ds</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.AImpl#getOwnedBs <em>Owned Bs</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.AImpl#getOwnedDs <em>Owned Ds</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.AImpl#getOwnedBs <em>Owned Bs</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
index 789b9dec56..ed32454ce3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.B;
 import org.eclipse.emf.cdo.tests.model6.C;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BImpl#getOwnedC <em>Owned C</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.BImpl#getOwnedC <em>Owned C</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
index b3f248e437..d5c67a86ed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/BaseObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
@@ -27,9 +27,9 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/CImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CImpl.java
index 2de63f54b1..293f0e344b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/CImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.C;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
index c545cd9b95..5dccb0df94 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/ContainmentObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.ContainmentObject;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -31,8 +31,8 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment Optional</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment Optional</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.ContainmentObjectImpl#getContainmentList <em>Containment List</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
index 541f6a8af0..f50178c41d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/DImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.D;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.DImpl#getData <em>Data</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.DImpl#getData <em>Data</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/EImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EImpl.java
index bf0a26d8bc..bb5b9c093d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/EImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.A;
 import org.eclipse.emf.cdo.tests.model6.E;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -29,7 +29,7 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.EImpl#getOwnedAs <em>Owned As</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.EImpl#getOwnedAs <em>Owned As</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/FImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/FImpl.java
index 7cdbe34eba..7e814bc36f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/FImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/FImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.E;
 import org.eclipse.emf.cdo.tests.model6.F;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -29,7 +29,7 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.FImpl#getOwnedEs <em>Owned Es</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.FImpl#getOwnedEs <em>Owned Es</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/GImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
index 1faf21d1e3..cebc15f7f5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/GImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.G;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
@@ -35,9 +35,9 @@ import java.util.List;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.GImpl#getDummy <em>Dummy</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.GImpl#getReference <em>Reference</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.GImpl#getList <em>List</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.GImpl#getDummy <em>Dummy</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.GImpl#getReference <em>Reference</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.GImpl#getList <em>List</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/HasNillableAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
index 4d73ddc7e4..91eb06e4f4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/HasNillableAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.HasNillableAttribute;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.HasNillableAttributeImpl#getNillable <em>Nillable</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HasNillableAttributeImpl#getNillable <em>Nillable</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/HoldableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HoldableImpl.java
index 484e200d19..8b877a0624 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/HoldableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HoldableImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.Holdable;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.HoldableImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HoldableImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/HolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HolderImpl.java
index c0723489db..94cde9ac7f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/HolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HolderImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.Holdable;
 import org.eclipse.emf.cdo.tests.model6.Holder;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -23,8 +23,8 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.HolderImpl#getHeld <em>Held</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.HolderImpl#getOwned <em>Owned</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HolderImpl#getHeld <em>Held</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.HolderImpl#getOwned <em>Owned</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
index cc398fd88c..197aac1dce 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
@@ -8,10 +8,8 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Factory;
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.A;
 import org.eclipse.emf.cdo.tests.model6.B;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
@@ -32,6 +30,8 @@ import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
 import org.eclipse.emf.cdo.tests.model6.Root;
 import org.eclipse.emf.cdo.tests.model6.Thing;
 import org.eclipse.emf.cdo.tests.model6.UnorderedList;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Factory;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -42,6 +42,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 import java.util.Map;
 
+//import org.eclipse.emf.cdo.tests.model6.*;
+
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
  * @generated
@@ -391,10 +393,8 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
   {
     MyEnum result = MyEnum.get(initialValue);
     if (result == null)
-    {
       throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
           + eDataType.getName() + "'");
-    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
index d27b352bb5..4d0a7db55b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
@@ -8,19 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Factory;
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
-import org.eclipse.emf.cdo.tests.model6.A;
-import org.eclipse.emf.cdo.tests.model6.B;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
-import org.eclipse.emf.cdo.tests.model6.C;
 import org.eclipse.emf.cdo.tests.model6.ContainmentObject;
-import org.eclipse.emf.cdo.tests.model6.D;
-import org.eclipse.emf.cdo.tests.model6.E;
-import org.eclipse.emf.cdo.tests.model6.F;
-import org.eclipse.emf.cdo.tests.model6.G;
 import org.eclipse.emf.cdo.tests.model6.HasNillableAttribute;
 import org.eclipse.emf.cdo.tests.model6.Holdable;
 import org.eclipse.emf.cdo.tests.model6.Holder;
@@ -33,6 +24,8 @@ import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
 import org.eclipse.emf.cdo.tests.model6.Root;
 import org.eclipse.emf.cdo.tests.model6.Thing;
 import org.eclipse.emf.cdo.tests.model6.UnorderedList;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Factory;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -226,7 +219,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
   /**
    * 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 Model6Package#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 -->
@@ -239,9 +232,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public static Model6Package init()
   {
     if (isInited)
-    {
       return (Model6Package)EPackage.Registry.INSTANCE.getEPackage(Model6Package.eNS_URI);
-    }
 
     // Obtain or create and register package
     Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE
@@ -827,9 +818,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -931,9 +920,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -946,23 +933,23 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    referenceObjectEClass.getESuperTypes().add(getBaseObject());
-    containmentObjectEClass.getESuperTypes().add(getBaseObject());
-    holderEClass.getESuperTypes().add(getHoldable());
-    thingEClass.getESuperTypes().add(getHoldable());
+    referenceObjectEClass.getESuperTypes().add(this.getBaseObject());
+    containmentObjectEClass.getESuperTypes().add(this.getBaseObject());
+    holderEClass.getESuperTypes().add(this.getHoldable());
+    thingEClass.getESuperTypes().add(this.getHoldable());
 
     // Initialize classes and features; add operations and parameters
     initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -980,28 +967,28 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1,
+    initEReference(getReferenceObject_ReferenceOptional(), this.getBaseObject(), null, "referenceOptional", null, 0, 1,
         ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1,
+    initEReference(getReferenceObject_ReferenceList(), this.getBaseObject(), null, "referenceList", null, 0, -1,
         ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0,
-        1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getContainmentObject_ContainmentOptional(), this.getBaseObject(), null, "containmentOptional", null,
+        0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1,
+    initEReference(getContainmentObject_ContainmentList(), this.getBaseObject(), null, "containmentList", null, 0, -1,
         ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1,
+    initEReference(getUnorderedList_Contained(), this.getUnorderedList(), null, "contained", null, 0, -1,
         UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1,
+    initEReference(getUnorderedList_Referenced(), this.getUnorderedList(), null, "referenced", null, 0, -1,
         UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
@@ -1009,10 +996,10 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
+    initEReference(getPropertiesMap_PersistentMap(), this.getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
         PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
+    initEReference(getPropertiesMap_TransientMap(), this.getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
         PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1020,7 +1007,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         !IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPropertiesMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), null, "value", null, 0, 1,
+    initEReference(getPropertiesMapEntry_Value(), this.getPropertiesMapEntryValue(), null, "value", null, 0, 1,
         Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1030,39 +1017,53 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         PropertiesMapEntryValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
-    initEClass(aEClass, A.class, "A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, A.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, A.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getA_OwnedDs(), this.getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getA_OwnedBs(), this.getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
-    initEClass(bEClass, B.class, "B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, B.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getB_OwnedC(), this.getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
-    initEClass(cEClass, C.class, "C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(cEClass, org.eclipse.emf.cdo.tests.model6.C.class, "C", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(dEClass, D.class, "D", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getD_Data(), ecorePackage.getEObject(), null, "data", null, 0, 1, D.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEClass(dEClass, org.eclipse.emf.cdo.tests.model6.D.class, "D", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getD_Data(), ecorePackage.getEObject(), null, "data", null, 0, 1,
+        org.eclipse.emf.cdo.tests.model6.D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(eEClass, E.class, "E", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, E.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getE_OwnedAs(), this.getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
-    initEClass(fEClass, F.class, "F", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, F.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getF_OwnedEs(), this.getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
-    initEClass(gEClass, G.class, "G", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1, G.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1, G.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, G.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(gEClass, org.eclipse.emf.cdo.tests.model6.G.class, "G", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1,
+        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_Reference(), this.getBaseObject(), null, "reference", null, 1, 1,
+        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_List(), this.getBaseObject(), null, "list", null, 0, -1,
+        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isAttributeModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -1072,19 +1073,20 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
+    initEAttribute(getMyEnumList_MyEnum(), this.getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMyEnumListUnsettable_MyEnum(), this.getMyEnum(), "myEnum", null, 0, -1,
+        MyEnumListUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(holderEClass, Holder.class, "Holder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT,
+    initEReference(getHolder_Held(), this.getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
         IS_ORDERED);
-    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
+    initEReference(getHolder_Owned(), this.getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1096,7 +1098,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1,
+    initEAttribute(getHasNillableAttribute_Nillable(), this.getMyString(), "nillable", null, 0, 1,
         HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/MyEnumListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListImpl.java
index b618782c20..66e0eed44b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/MyEnumListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.MyEnum;
 import org.eclipse.emf.cdo.tests.model6.MyEnumList;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -28,7 +28,7 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.MyEnumListImpl#getMyEnum <em>My Enum</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.MyEnumListImpl#getMyEnum <em>My Enum</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/MyEnumListUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
index bdf516cef1..2b8abe6d81 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/MyEnumListUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.MyEnum;
 import org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -29,7 +29,7 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.MyEnumListUnsettableImpl#getMyEnum <em>My Enum</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.MyEnumListUnsettableImpl#getMyEnum <em>My Enum</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/PropertiesMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
index 2f5d28965c..325c52ab8b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/PropertiesMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -30,8 +30,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.PropertiesMapEntryImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.PropertiesMapEntryImpl#getTypedValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryImpl#getTypedKey <em>Key</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/PropertiesMapEntryValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
index 6439e4f528..c717374ad3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/PropertiesMapEntryValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.PropertiesMapEntryValueImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapEntryValueImpl#getLabel <em>Label</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/PropertiesMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
index 9487317421..96d6d57bd9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/PropertiesMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.PropertiesMap;
 import org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -32,9 +32,9 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.PropertiesMapImpl#getLabel <em>Label</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.PropertiesMapImpl#getPersistentMap <em>Persistent Map</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.PropertiesMapImpl#getTransientMap <em>Transient Map</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapImpl#getLabel <em>Label</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapImpl#getPersistentMap <em>Persistent Map</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.PropertiesMapImpl#getTransientMap <em>Transient Map</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
index a561f60a9e..c49b634f02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/ReferenceObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/RootImpl.java
index 20fb79b1c5..090d7dcee4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/RootImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/RootImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.Root;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -29,10 +29,10 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListA <em>List A</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListB <em>List B</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListC <em>List C</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListD <em>List D</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.RootImpl#getListA <em>List A</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.RootImpl#getListB <em>List B</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.RootImpl#getListC <em>List C</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.RootImpl#getListD <em>List D</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/ThingImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ThingImpl.java
index 750102df1f..f613104998 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/ThingImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ThingImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.Thing;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/UnorderedListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnorderedListImpl.java
index f22f45d22a..cf15cad631 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/legacy/UnorderedListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnorderedListImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.model6.impl.legacy;
+package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.UnorderedList;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -29,8 +29,8 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.UnorderedListImpl#getContained <em>Contained</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.UnorderedListImpl#getReferenced <em>Referenced</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.UnorderedListImpl#getContained <em>Contained</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model6.legacy.impl.UnorderedListImpl#getReferenced <em>Referenced</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
new file mode 100644
index 0000000000..55cabdc9e0
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
@@ -0,0 +1,555 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.model6.legacy.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.cdo.tests.model6.*;
+
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package
+ * @generated
+ */
+public class Model6AdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static Model6Package modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Model6AdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Model6Package.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 Model6Switch<Adapter> modelSwitch = new Model6Switch<Adapter>()
+  {
+    @Override
+    public Adapter caseRoot(Root object)
+    {
+      return createRootAdapter();
+    }
+
+    @Override
+    public Adapter caseBaseObject(BaseObject object)
+    {
+      return createBaseObjectAdapter();
+    }
+
+    @Override
+    public Adapter caseReferenceObject(ReferenceObject object)
+    {
+      return createReferenceObjectAdapter();
+    }
+
+    @Override
+    public Adapter caseContainmentObject(ContainmentObject object)
+    {
+      return createContainmentObjectAdapter();
+    }
+
+    @Override
+    public Adapter caseUnorderedList(UnorderedList object)
+    {
+      return createUnorderedListAdapter();
+    }
+
+    @Override
+    public Adapter casePropertiesMap(PropertiesMap object)
+    {
+      return createPropertiesMapAdapter();
+    }
+
+    @Override
+    public Adapter casePropertiesMapEntry(Map.Entry<String, PropertiesMapEntryValue> object)
+    {
+      return createPropertiesMapEntryAdapter();
+    }
+
+    @Override
+    public Adapter casePropertiesMapEntryValue(PropertiesMapEntryValue object)
+    {
+      return createPropertiesMapEntryValueAdapter();
+    }
+
+    @Override
+    public Adapter caseA(A object)
+    {
+      return createAAdapter();
+    }
+
+    @Override
+    public Adapter caseB(B object)
+    {
+      return createBAdapter();
+    }
+
+    @Override
+    public Adapter caseC(C object)
+    {
+      return createCAdapter();
+    }
+
+    @Override
+    public Adapter caseD(D object)
+    {
+      return createDAdapter();
+    }
+
+    @Override
+    public Adapter caseE(E object)
+    {
+      return createEAdapter();
+    }
+
+    @Override
+    public Adapter caseF(F object)
+    {
+      return createFAdapter();
+    }
+
+    @Override
+    public Adapter caseG(G object)
+    {
+      return createGAdapter();
+    }
+
+    @Override
+    public Adapter caseMyEnumList(MyEnumList object)
+    {
+      return createMyEnumListAdapter();
+    }
+
+    @Override
+    public Adapter caseMyEnumListUnsettable(MyEnumListUnsettable object)
+    {
+      return createMyEnumListUnsettableAdapter();
+    }
+
+    @Override
+    public Adapter caseHolder(Holder object)
+    {
+      return createHolderAdapter();
+    }
+
+    @Override
+    public Adapter caseThing(Thing object)
+    {
+      return createThingAdapter();
+    }
+
+    @Override
+    public Adapter caseHoldable(Holdable object)
+    {
+      return createHoldableAdapter();
+    }
+
+    @Override
+    public Adapter caseHasNillableAttribute(HasNillableAttribute object)
+    {
+      return createHasNillableAttributeAdapter();
+    }
+
+    @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.model6.Root <em>Root</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.model6.Root
+   * @generated
+   */
+  public Adapter createRootAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</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.model6.BaseObject
+   * @generated
+   */
+  public Adapter createBaseObjectAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject <em>Reference Object</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.model6.ReferenceObject
+   * @generated
+   */
+  public Adapter createReferenceObjectAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject <em>Containment Object</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.model6.ContainmentObject
+   * @generated
+   */
+  public Adapter createContainmentObjectAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.UnorderedList <em>Unordered List</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.model6.UnorderedList
+   * @generated
+   */
+  public Adapter createUnorderedListAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMap <em>Properties Map</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.model6.PropertiesMap
+   * @generated
+   */
+  public Adapter createPropertiesMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Properties Map Entry</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createPropertiesMapEntryAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.PropertiesMapEntryValue <em>Properties Map Entry Value</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.model6.PropertiesMapEntryValue
+   * @generated
+   */
+  public Adapter createPropertiesMapEntryValueAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.A <em>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.model6.A
+   * @generated
+   */
+  public Adapter createAAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.B <em>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.model6.B
+   * @generated
+   */
+  public Adapter createBAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.C <em>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.model6.C
+   * @generated
+   */
+  public Adapter createCAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.D <em>D</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.model6.D
+   * @generated
+   */
+  public Adapter createDAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.E <em>E</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.model6.E
+   * @generated
+   */
+  public Adapter createEAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.F <em>F</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.model6.F
+   * @generated
+   */
+  public Adapter createFAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.G <em>G</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.model6.G
+   * @generated
+   */
+  public Adapter createGAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.MyEnumList <em>My Enum List</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.model6.MyEnumList
+   * @generated
+   */
+  public Adapter createMyEnumListAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable <em>My Enum List Unsettable</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.model6.MyEnumListUnsettable
+   * @generated
+   */
+  public Adapter createMyEnumListUnsettableAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.Holder <em>Holder</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.model6.Holder
+   * @generated
+   */
+  public Adapter createHolderAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.Thing <em>Thing</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.model6.Thing
+   * @generated
+   */
+  public Adapter createThingAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.Holdable <em>Holdable</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.model6.Holdable
+   * @generated
+   */
+  public Adapter createHoldableAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.HasNillableAttribute <em>Has Nillable Attribute</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.model6.HasNillableAttribute
+   * @generated
+   */
+  public Adapter createHasNillableAttributeAdapter()
+  {
+    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;
+  }
+
+} //Model6AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
new file mode 100644
index 0000000000..43fd3db68e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
@@ -0,0 +1,629 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.model6.legacy.util;
+
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.cdo.tests.model6.*;
+
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.model6.legacy.Model6Package
+ * @generated
+ */
+public class Model6Switch<T>
+{
+  /**
+   * The cached model package
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static Model6Package modelPackage;
+
+  /**
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Model6Switch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Model6Package.eINSTANCE;
+    }
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  public T doSwitch(EObject theEObject)
+  {
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+    case Model6Package.ROOT:
+    {
+      Root root = (Root)theEObject;
+      T result = caseRoot(root);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.BASE_OBJECT:
+    {
+      BaseObject baseObject = (BaseObject)theEObject;
+      T result = caseBaseObject(baseObject);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.REFERENCE_OBJECT:
+    {
+      ReferenceObject referenceObject = (ReferenceObject)theEObject;
+      T result = caseReferenceObject(referenceObject);
+      if (result == null)
+        result = caseBaseObject(referenceObject);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.CONTAINMENT_OBJECT:
+    {
+      ContainmentObject containmentObject = (ContainmentObject)theEObject;
+      T result = caseContainmentObject(containmentObject);
+      if (result == null)
+        result = caseBaseObject(containmentObject);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.UNORDERED_LIST:
+    {
+      UnorderedList unorderedList = (UnorderedList)theEObject;
+      T result = caseUnorderedList(unorderedList);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.PROPERTIES_MAP:
+    {
+      PropertiesMap propertiesMap = (PropertiesMap)theEObject;
+      T result = casePropertiesMap(propertiesMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.PROPERTIES_MAP_ENTRY:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, PropertiesMapEntryValue> propertiesMapEntry = (Map.Entry<String, PropertiesMapEntryValue>)theEObject;
+      T result = casePropertiesMapEntry(propertiesMapEntry);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.PROPERTIES_MAP_ENTRY_VALUE:
+    {
+      PropertiesMapEntryValue propertiesMapEntryValue = (PropertiesMapEntryValue)theEObject;
+      T result = casePropertiesMapEntryValue(propertiesMapEntryValue);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.A:
+    {
+      A a = (A)theEObject;
+      T result = caseA(a);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.B:
+    {
+      B b = (B)theEObject;
+      T result = caseB(b);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.C:
+    {
+      C c = (C)theEObject;
+      T result = caseC(c);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.D:
+    {
+      D d = (D)theEObject;
+      T result = caseD(d);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.E:
+    {
+      E e = (E)theEObject;
+      T result = caseE(e);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.F:
+    {
+      F f = (F)theEObject;
+      T result = caseF(f);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.G:
+    {
+      G g = (G)theEObject;
+      T result = caseG(g);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.MY_ENUM_LIST:
+    {
+      MyEnumList myEnumList = (MyEnumList)theEObject;
+      T result = caseMyEnumList(myEnumList);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.MY_ENUM_LIST_UNSETTABLE:
+    {
+      MyEnumListUnsettable myEnumListUnsettable = (MyEnumListUnsettable)theEObject;
+      T result = caseMyEnumListUnsettable(myEnumListUnsettable);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.HOLDER:
+    {
+      Holder holder = (Holder)theEObject;
+      T result = caseHolder(holder);
+      if (result == null)
+        result = caseHoldable(holder);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.THING:
+    {
+      Thing thing = (Thing)theEObject;
+      T result = caseThing(thing);
+      if (result == null)
+        result = caseHoldable(thing);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.HOLDABLE:
+    {
+      Holdable holdable = (Holdable)theEObject;
+      T result = caseHoldable(holdable);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model6Package.HAS_NILLABLE_ATTRIBUTE:
+    {
+      HasNillableAttribute hasNillableAttribute = (HasNillableAttribute)theEObject;
+      T result = caseHasNillableAttribute(hasNillableAttribute);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    default:
+      return defaultCase(theEObject);
+    }
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Root</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>Root</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseRoot(Root object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Base Object</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>Base Object</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseBaseObject(BaseObject object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Reference Object</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>Reference Object</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseReferenceObject(ReferenceObject object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Containment Object</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>Containment Object</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseContainmentObject(ContainmentObject object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Unordered List</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>Unordered List</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseUnorderedList(UnorderedList object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Properties Map</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>Properties Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T casePropertiesMap(PropertiesMap object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Properties Map Entry</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>Properties Map Entry</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T casePropertiesMapEntry(Map.Entry<String, PropertiesMapEntryValue> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Properties Map Entry Value</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>Properties Map Entry Value</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T casePropertiesMapEntryValue(PropertiesMapEntryValue object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>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>A</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseA(A object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>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>B</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseB(B object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>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>C</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseC(C object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>D</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>D</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseD(D object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>E</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>E</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseE(E object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>F</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>F</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseF(F object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>G</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>G</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseG(G object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>My Enum List</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>My Enum List</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMyEnumList(MyEnumList object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>My Enum List Unsettable</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>My Enum List Unsettable</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMyEnumListUnsettable(MyEnumListUnsettable object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Holder</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>Holder</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseHolder(Holder object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Thing</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>Thing</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseThing(Thing object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Holdable</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>Holdable</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseHoldable(Holdable object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Has Nillable Attribute</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>Has Nillable Attribute</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseHasNillableAttribute(HasNillableAttribute 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
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} //Model6Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
index fc1e2d84a9..a1b5c3eb02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.cdo.tests.model6.G;
 import org.eclipse.emf.cdo.tests.model6.HasNillableAttribute;
 import org.eclipse.emf.cdo.tests.model6.Holdable;
 import org.eclipse.emf.cdo.tests.model6.Holder;
-import org.eclipse.emf.cdo.tests.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.MyEnumList;
 import org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable;
 import org.eclipse.emf.cdo.tests.model6.PropertiesMap;
@@ -31,6 +30,7 @@ import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
 import org.eclipse.emf.cdo.tests.model6.Root;
 import org.eclipse.emf.cdo.tests.model6.Thing;
 import org.eclipse.emf.cdo.tests.model6.UnorderedList;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
index ca28eddb9a..a70064a285 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.cdo.tests.model6.G;
 import org.eclipse.emf.cdo.tests.model6.HasNillableAttribute;
 import org.eclipse.emf.cdo.tests.model6.Holdable;
 import org.eclipse.emf.cdo.tests.model6.Holder;
-import org.eclipse.emf.cdo.tests.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.MyEnumList;
 import org.eclipse.emf.cdo.tests.model6.MyEnumListUnsettable;
 import org.eclipse.emf.cdo.tests.model6.PropertiesMap;
@@ -31,6 +30,7 @@ import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
 import org.eclipse.emf.cdo.tests.model6.Root;
 import org.eclipse.emf.cdo.tests.model6.Thing;
 import org.eclipse.emf.cdo.tests.model6.UnorderedList;
+import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
index 461da26ebd..1ef3788fcb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
@@ -248,12 +248,12 @@ public abstract class ModelConfig extends Config implements IModelConfig
 
     public Model6Factory getModel6Factory()
     {
-      return org.eclipse.emf.cdo.tests.legacy.model6.Model6Factory.eINSTANCE;
+      return org.eclipse.emf.cdo.tests.model6.legacy.Model6Factory.eINSTANCE;
     }
 
     public Model6Package getModel6Package()
     {
-      return org.eclipse.emf.cdo.tests.legacy.model6.Model6Package.eINSTANCE;
+      return org.eclipse.emf.cdo.tests.model6.legacy.Model6Package.eINSTANCE;
     }
   }
 }