[240343] [Hibernate] Exception: No annotated model element present for: ISingleRefContainer for type EClass has its epackage been registered with Teneo?

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

3 files changed, 19 insertions, 19 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/.classpath b/plugins/org.eclipse.emf.cdo.tests.model4/.classpath
index 64c5e31b7a..304e86186a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/.classpath
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
index 3bf25434b0..3dd1505eb9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
@@ -72,25 +72,25 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
         eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainer" eSuperTypes="interfaces.ecore#//ISingleRefContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainedElement" eSuperTypes="interfaces.ecore#//ISingleRefContainedElement">
+  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefContainer"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefContainedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainer" eSuperTypes="interfaces.ecore#//ISingleRefNonContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainedElement" eSuperTypes="interfaces.ecore#//ISingleRefNonContainedElement">
+  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefNonContainer"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefNonContainedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainer" eSuperTypes="interfaces.ecore#//IMultiRefNonContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainedElement" eSuperTypes="interfaces.ecore#//IMultiRefNonContainedElement">
+  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefNonContainer"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefNonContainedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainer" eSuperTypes="interfaces.ecore#//IMultiRefContainer"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainedElement" eSuperTypes="interfaces.ecore#//IMultiRefContainedElement">
+  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainer" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefContainer"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainedElement" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefContainedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainerNPL" eSuperTypes="interfaces.ecore#//ISingleRefContainerNPL"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainerNPL" eSuperTypes="interfaces.ecore#//ISingleRefNonContainerNPL"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainerNPL" eSuperTypes="interfaces.ecore#//IMultiRefContainerNPL"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainerNPL" eSuperTypes="interfaces.ecore#//IMultiRefNonContainerNPL"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ImplContainedElementNPL" eSuperTypes="interfaces.ecore#//IContainedElementNoParentLink interfaces.ecore#//INamedElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefContainerNPL"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplSingleRefNonContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//ISingleRefNonContainerNPL"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefContainerNPL"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplMultiRefNonContainerNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IMultiRefNonContainerNPL"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ImplContainedElementNPL" eSuperTypes="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//IContainedElementNoParentLink ../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.ecore#//INamedElement"/>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
index 6fc6bace1a..3fbef959e7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
@@ -2,11 +2,11 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model4/src"
-    editDirectory="/org.eclipse.emf.cdo.tests.model4.edit/src" editorDirectory="/org.eclipse.emf.cdo.tests.model4.editor/src"
-    modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" rootExtendsInterface="org.eclipse.emf.cdo.CDOObject"
-    rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"
-    importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective" complianceLevel="6.0"
-    copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit" usedGenPackages="interfaces.genmodel#//model4interfaces">
+    editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4"
+    modelName="Model4" rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit"
+    usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel#//model4interfaces">
   <foreignModel>model4.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"