TCI - Fixed broken Ecore References

Change-Id: Ic8c0e519fecb7ca5cb0c30097fc48e2d931af514
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
index 49926b7..51ef154 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
@@ -31,7 +31,7 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="CategorizableElement" abstract="true"

       eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Element">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="labelObject" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"

+    <eStructuralFeatures xsi:type="ecore:EReference" name="labelObject" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"

         changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>

   </eClassifiers>

 </ecore:EPackage>

diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
index e95b9de..fe78f5b 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
@@ -6,7 +6,7 @@
         eType="#//GroupType"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelAlignment" eType="#//GroupLabelAlignment"
         defaultValueLiteral="LabelAligned"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="GroupType">
     <eLiterals name="Normal"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore
index db0022b..ed11e43 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore
@@ -6,7 +6,7 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="constraints" value="resolveable"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappedClass" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappedClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
         containment="true"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore b/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
index c9c5d00..671daa9 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
@@ -13,13 +13,13 @@
         eType="#//VAttachment" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

         transient="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

         unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

         unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minHeight" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

         unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

         unsettable="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VAttachment" abstract="true" interface="true"/>

@@ -34,16 +34,16 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="DomainModelReference">

     <eOperations name="resolve"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"

+    <eStructuralFeatures xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"

         transient="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"

-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VFeaturePathDomainModelReference" eSuperTypes="#//DomainModelReference">

     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"

-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>

+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"

-        upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>

+        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

   </eClassifiers>

   <eSubpackages name="separator">

     <eClassifiers xsi:type="ecore:EClass" name="VSeparator" eSuperTypes="#//VElement">

@@ -96,14 +96,14 @@
   </eSubpackages>

   <eSubpackages name="customControl">

     <eClassifiers xsi:type="ecore:EClass" name="VCustomControl" eSuperTypes="#//VElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     </eClassifiers>

   </eSubpackages>

   <eSubpackages name="customComposite">

     <eClassifiers xsi:type="ecore:EClass" name="VCustomViewModelElement" eSuperTypes="#//VElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     </eClassifiers>

   </eSubpackages>

   <eSubpackages name="columnComposite">

diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore b/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore
index 2465781..b93e347 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore
@@ -4,7 +4,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="Condition" abstract="true"/>

   <eClassifiers xsi:type="ecore:EClass" name="LeafCondition" eSuperTypes="#//Condition">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="expectedValue" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"

         eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"

         containment="true"/>

diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore b/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore
index 122c43f..b656e5b 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore
@@ -10,6 +10,6 @@
         transient="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="StackItem" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Container">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore
index 4bec29b..184a70f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore
@@ -4,8 +4,8 @@
     nsPrefix="org.eclipse.emf.ecp.view.template.selector.viewmodelelement.model">
   <eClassifiers xsi:type="ecore:EClass" name="ViewModelElementSelector" eSuperTypes="template.ecore#//StyleSelector">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectSubclasses" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="classType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="classType" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore
index d4165d7..8f4d212 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore
@@ -3,6 +3,6 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="viewproxy" nsURI="http://org/eclipse/emf/ecp/view/viewproxy/model"
     nsPrefix="org.eclipse.emf.ecp.view.viewproxy.model">
   <eClassifiers xsi:type="ecore:EClass" name="ViewProxy" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore
index 7d9dc83..3bb205d 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore
@@ -6,7 +6,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="errorReports" upperBound="-1"
         eType="#//ErrorReport" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="importedEObjects" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="settingToSheetMap" upperBound="-1"
         eType="#//SettingToSheetMapping"/>
   </eClassifiers>
@@ -38,7 +38,7 @@
         defaultValueLiteral="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EMFLocation">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="settingLocation" eType="#//SettingLocation"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dmrLocation" eType="#//DMRLocation"
@@ -46,9 +46,9 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SettingLocation">
     <eStructuralFeatures xsi:type="ecore:EReference" name="eObject" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DMRLocation">
     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore
index 865eb2b..b06bb69 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore
@@ -2,6 +2,6 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xpackage" nsURI="x.nsuri" nsPrefix="xprefix">
   <eClassifiers xsi:type="ecore:EClass" name="xclass">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="x1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="x1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore
index d7dcb16..f35364c 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore
@@ -3,7 +3,7 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://org/eclipse/emf/ecp/view/model" nsPrefix="org.eclipse.emf.ecp.view.model">
   <eClassifiers xsi:type="ecore:EClass" name="Diagnostic">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagnostics" upperBound="-1"
-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Attachment" abstract="true"/>
@@ -14,17 +14,17 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FeaturePathDomainModelReference" eSuperTypes="#//DomainModelReference">
     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEFeature" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"
-        upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
+        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         transient="true" defaultValueLiteral="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         transient="true" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="diagnostic" eType="#//Diagnostic"
         transient="true" containment="true"/>
@@ -33,11 +33,11 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="View" eSuperTypes="#//Element">
     <eStructuralFeatures xsi:type="ecore:EReference" name="rootEClass" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
         eType="#//ContainedElement" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ecorePath" lowerBound="1"
-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ContainedElement" abstract="true" eSuperTypes="#//Element"/>
   <eClassifiers xsi:type="ecore:EClass" name="Container" abstract="true" eSuperTypes="#//Element">
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore b/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore
index 8c3beeb..7bae1f7 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore
@@ -6,9 +6,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="domainModel" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"

         transient="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="childReference" lowerBound="1"

-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>

+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="pathToRoot" upperBound="-1"

-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>

+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="childComposite" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement"

         containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"

@@ -21,24 +21,24 @@
         eType="#//DynamicContainmentItem" transient="true" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="composite" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement"

         containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseItemIndex" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EIntegerObject"

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseItemIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"

         transient="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TestElement" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject">

-    <eOperations name="validate" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean">

-      <eParameters name="diagnostic" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDiagnosticChain"/>

+  <eClassifiers xsi:type="ecore:EClass" name="TestElement" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">

+    <eOperations name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

+      <eParameters name="diagnostic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

       <eParameters name="context">

-        <eGenericType eClassifier="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EMap">

+        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">

           <eTypeArguments/>

           <eTypeArguments/>

         </eGenericType>

       </eParameters>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"

         eType="#//TestElement" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <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="DomainRoot">

     <eStructuralFeatures xsi:type="ecore:EReference" name="intermediate" eType="#//DomainIntermediate"

@@ -51,7 +51,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="TestElementContainer">

     <eStructuralFeatures xsi:type="ecore:EReference" name="testElements" upperBound="-1"

         eType="#//TestElement" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="DynamicContainmentTreeDomainModelReference"

       eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference">

diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore
index 4379430..d19653d 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore
@@ -27,7 +27,7 @@
     <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="EClassToAdditionMap" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//AbstractChild"/>
   </eClassifiers>
 </ecore:EPackage>