Bug 487380: Setup Neon buildmaven

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

Update the build for selection of stable or
bleeding-edge dependencies according to a new
NIGHTLY_DEPS Hudson configuration variable.

Update the build for the latest stable RCPTT
Runner Maven Plug-in for Eclipse Neon .

Updates for final API changes in Papyrus Neon M6
in the refactoring of UI-dependent APIs and the
replacement of integer visual IDs in the generated
diagrams with meaningful shared IDs.

Add the Papyrus C++ Library bundle to the codegen test bundle's
dependencies because it is required in the target platform to
resolve references from test models to the AnsiCLibrary.uml.

(master branch - java 8_64 required) 

Change-Id: Ic73c458c4822813516d8e8eed552e3656bbfc5e4
Co-authored-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>

23 files changed, 147 insertions, 83 deletions

diff --git a/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF b/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
index 42a89e766..c7ab3f83e 100644
--- a/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
+++ b/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
@@ -23,4 +23,5 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.10.1",
  org.eclipse.papyrusrt.xtumlrt.umlrt.model;bundle-version="0.7.2",
  org.eclipse.uml2.uml.resources;bundle-version="5.1.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.4",
+ org.eclipse.papyrus.cpp.library;bundle-version="1.2.0",
  org.junit;bundle-version="4.11.0"
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF
index 8e5d49d40..b5f1948d8 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="1.1.3",
  org.eclipse.emf.transaction;bundle-version="1.9.0",
  org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.3",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.3",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.3",
+ org.eclipse.papyrus.infra.types;bundle-version="2.0.0",
  org.eclipse.papyrus.uml.tools;bundle-version="1.1.3",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.3",
  org.eclipse.swt;bundle-version="3.103.0",
@@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="1.1.3",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
  org.eclipse.ui;bundle-version="3.100.0",
  org.eclipse.ui.editors;bundle-version="3.9.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.3"
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.3",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
 Export-Package: org.eclipse.papyrusrt.umlrt.core.cpp.tests,
  org.eclipse.papyrusrt.umlrt.core.cpp.tests.lifecycle
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java
index 9c0305095..1debbda32 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java
@@ -23,12 +23,12 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF
index b6516f7e3..54c55da85 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.hamcrest.core;bundle-version="1.3.0",
  org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.1",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.1",
+ org.eclipse.papyrus.infra.types;bundle-version="2.0.0",
  org.eclipse.core.resources;bundle-version="3.10.0",
  org.eclipse.core.runtime;bundle-version="3.11.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
@@ -45,7 +45,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrusrt.umlrt.tooling.diagram.common;bundle-version="0.7.2",
  org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine;bundle-version="0.7.2",
  org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.3"
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.3",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrusrt.umlrt.core.tests,
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java
index aa016fcc7..cb7a60b3f 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java
@@ -21,12 +21,12 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
@@ -106,7 +106,7 @@ public abstract class AbstractPapyrusRTCoreTest extends AbstractPapyrusTest {
 				// force loading of the state machine plugin, but in UI thread, as the element types require some UI...
 				ElementTypeSetConfigurationRegistry registry = ElementTypeSetConfigurationRegistry.getInstance();
 				System.err.println(registry.getElementTypeSetConfigurations());
-				System.err.println(UMLElementTypes.Region_3000);
+				System.err.println(UMLElementTypes.Region_Shape);
 				
 			}
 		});
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java
index b507e9d98..9582fbc47 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java
@@ -32,18 +32,18 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java
index 23c343083..b574ea523 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java
index 50133bb73..c7f7252c7 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.emf.validation.service.ConstraintRegistry;
 import org.eclipse.emf.validation.service.IConstraintDescriptor;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
+import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician;
 import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java
index 1312d5c96..235e4b086 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.validation.service.ConstraintRegistry;
 import org.eclipse.emf.validation.service.IConstraintDescriptor;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
+import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician;
 import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java
index 34f59a201..ef61bba24 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.emf.validation.service.ConstraintRegistry;
 import org.eclipse.emf.validation.service.IConstraintDescriptor;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
+import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician;
 import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java
index 6cda2f283..778327c52 100644
--- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java
+++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.validation.service.ConstraintRegistry;
 import org.eclipse.emf.validation.service.IConstraintDescriptor;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
-import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
+import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician;
 import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF
index f0b78f1fc..78c184ffc 100644
--- a/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF
@@ -8,4 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.11.0",
  org.junit;bundle-version="4.12.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2"
+ org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2",
+ org.eclipse.swt;bundle-version="3.105.0",
+ org.eclipse.ui;bundle-version="3.107.0"
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF
index e14d2027a..623e4bb4c 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.common;bundle-version="2.11.0",
  org.eclipse.emf.ecore;bundle-version="2.11.1",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.2",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.2",
+ org.eclipse.papyrus.infra.types;bundle-version="2.0.0",
  org.eclipse.papyrusrt.umlrt.tooling.diagram.common;bundle-version="0.7.2",
  org.eclipse.papyrus.junit.framework;bundle-version="1.1.2",
  org.eclipse.emf.transaction;bundle-version="1.9.0",
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation
index a533d4566..5a6d662cd 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_gq7EoOq1EeW8AN6iCLZekA" type="CompositeStructure" measurementUnit="Pixel" name="Capsule1">
-    <children xmi:type="notation:Shape" xmi:id="_grlL8Oq1EeW8AN6iCLZekA" type="2073">
+    <children xmi:type="notation:Shape" xmi:id="_grlL8Oq1EeW8AN6iCLZekA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_groPQOq1EeW8AN6iCLZekA" type="5156"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_groPQeq1EeW8AN6iCLZekA" type="6089">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_groPQuq1EeW8AN6iCLZekA" y="5"/>
@@ -31,7 +31,7 @@
         <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i_HU0-q1EeW8AN6iCLZekA"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_tOONIOq1EeW8AN6iCLZekA" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_tOONIOq1EeW8AN6iCLZekA" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_tOONIuq1EeW8AN6iCLZekA" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_tOONI-q1EeW8AN6iCLZekA" x="25" y="3"/>
         </children>
@@ -41,7 +41,7 @@
         <element xmi:type="uml:Port" href="model.uml#_sVQk0Oq1EeW8AN6iCLZekA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tOONIeq1EeW8AN6iCLZekA" x="-10" y="96" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_vdW-MOq1EeW8AN6iCLZekA" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_vdW-MOq1EeW8AN6iCLZekA" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_vdXlQOq1EeW8AN6iCLZekA" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_vdXlQeq1EeW8AN6iCLZekA" x="25" y="3"/>
         </children>
@@ -63,13 +63,13 @@
     <element xmi:type="uml:Class" href="model.uml#_gmG2EOq1EeW8AN6iCLZekA"/>
   </notation:Diagram>
   <notation:Diagram xmi:id="_iR8FwOq1EeW8AN6iCLZekA" type="CompositeStructure" measurementUnit="Pixel" name="Capsule2">
-    <children xmi:type="notation:Shape" xmi:id="_iR8s0Oq1EeW8AN6iCLZekA" type="2073">
+    <children xmi:type="notation:Shape" xmi:id="_iR8s0Oq1EeW8AN6iCLZekA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_iR8s0uq1EeW8AN6iCLZekA" type="5156"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_iR8s0-q1EeW8AN6iCLZekA" type="6089">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_iR8s1Oq1EeW8AN6iCLZekA" y="5"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_iR8s1eq1EeW8AN6iCLZekA" type="7073">
-        <children xmi:type="notation:Shape" xmi:id="_774UYOq1EeW8AN6iCLZekA" type="3070">
+        <children xmi:type="notation:Shape" xmi:id="_774UYOq1EeW8AN6iCLZekA" type="Property_Shape">
           <children xmi:type="notation:DecorationNode" xmi:id="_774UYuq1EeW8AN6iCLZekA" type="5126"/>
           <children xmi:type="notation:DecorationNode" xmi:id="_774UY-q1EeW8AN6iCLZekA" type="6054">
             <layoutConstraint xmi:type="notation:Location" xmi:id="_774UZOq1EeW8AN6iCLZekA" y="5"/>
@@ -78,7 +78,7 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_774UZuq1EeW8AN6iCLZekA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_774UZ-q1EeW8AN6iCLZekA"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_78EhoOq1EeW8AN6iCLZekA" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_78EhoOq1EeW8AN6iCLZekA" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_78FIsOq1EeW8AN6iCLZekA" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_78FIseq1EeW8AN6iCLZekA" x="-86" y="-12"/>
             </children>
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF
index a36540d91..aea79603d 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore;bundle-version="2.11.1",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.2",
  org.eclipse.papyrus.infra.newchild;bundle-version="1.1.2",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.2",
+ org.eclipse.papyrus.infra.types;bundle-version="2.0.0",
  org.eclipse.papyrusrt.umlrt.tooling.properties;bundle-version="0.7.2",
  org.eclipse.papyrusrt.umlrt.tooling.modelexplorer;bundle-version="0.7.2",
  org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2",
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation
index f4416c828..4a3578068 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Od60MJTrEeW50dEfV7kAUw" type="CompositeStructure" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_Od9QcJTrEeW50dEfV7kAUw" type="2073">
+  <children xmi:type="notation:Shape" xmi:id="_Od9QcJTrEeW50dEfV7kAUw" type="Class_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_Od9QcpTrEeW50dEfV7kAUw" type="5156"/>
     <children xmi:type="notation:DecorationNode" xmi:id="_Od9Qc5TrEeW50dEfV7kAUw" type="6089">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Od9QdJTrEeW50dEfV7kAUw" y="5"/>
@@ -30,7 +30,7 @@
       <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QEIkE5TrEeW50dEfV7kAUw"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_TcHMgJTrEeW50dEfV7kAUw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_TcHMgJTrEeW50dEfV7kAUw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_TcHMgpTrEeW50dEfV7kAUw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TcHMg5TrEeW50dEfV7kAUw" x="25" y="3"/>
       </children>
@@ -40,7 +40,7 @@
       <element xmi:type="uml:Port" href="library.uml#_QuskAJTrEeW50dEfV7kAUw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcHMgZTrEeW50dEfV7kAUw" x="-10" y="59" width="20" height="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_WUPQMJTrEeW50dEfV7kAUw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_WUPQMJTrEeW50dEfV7kAUw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_WUP3QJTrEeW50dEfV7kAUw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WUP3QZTrEeW50dEfV7kAUw" x="25" y="3"/>
       </children>
@@ -50,7 +50,7 @@
       <element xmi:type="uml:Port" href="library.uml#_VpBwAJTrEeW50dEfV7kAUw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUPQMZTrEeW50dEfV7kAUw" x="59" y="102" width="20" height="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_XNsAsJTrEeW50dEfV7kAUw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_XNsAsJTrEeW50dEfV7kAUw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_XNsnwJTrEeW50dEfV7kAUw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_XNsnwZTrEeW50dEfV7kAUw" x="25" y="3"/>
       </children>
@@ -60,7 +60,7 @@
       <element xmi:type="uml:Port" href="library.uml#_WiMMoJTrEeW50dEfV7kAUw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XNsAsZTrEeW50dEfV7kAUw" x="-10" y="178" width="20" height="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_X_UR8JTrEeW50dEfV7kAUw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_X_UR8JTrEeW50dEfV7kAUw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_X_UR8pTrEeW50dEfV7kAUw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_X_UR85TrEeW50dEfV7kAUw" x="25" y="3"/>
       </children>
@@ -70,7 +70,7 @@
       <element xmi:type="uml:Port" href="library.uml#_XfOcoJTrEeW50dEfV7kAUw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X_UR8ZTrEeW50dEfV7kAUw" x="490" y="60" width="20" height="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_YyFysJTrEeW50dEfV7kAUw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_YyFysJTrEeW50dEfV7kAUw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_YyGZwZTrEeW50dEfV7kAUw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_YyGZwpTrEeW50dEfV7kAUw" x="25" y="3"/>
       </children>
@@ -80,7 +80,7 @@
       <element xmi:type="uml:Port" href="library.uml#_YLa0QJTrEeW50dEfV7kAUw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YyGZwJTrEeW50dEfV7kAUw" x="264" y="144" width="20" height="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_t1coMJUhEeW98PTE4--NLw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_t1coMJUhEeW98PTE4--NLw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_t1dPQJUhEeW98PTE4--NLw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_t1dPQZUhEeW98PTE4--NLw" x="25" y="3"/>
       </children>
@@ -90,7 +90,7 @@
       <element xmi:type="uml:Port" href="library.uml#_tXMl8JUhEeW98PTE4--NLw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t1coMZUhEeW98PTE4--NLw" x="345" y="272" width="20" height="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_wVYOUJUhEeW98PTE4--NLw" type="3069">
+    <children xmi:type="notation:Shape" xmi:id="_wVYOUJUhEeW98PTE4--NLw" type="Port_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_wVY1YJUhEeW98PTE4--NLw" type="5125">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_wVY1YZUhEeW98PTE4--NLw" x="25" y="3"/>
       </children>
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation
index 3d9d3a61c..79da29e58 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_2K1DwJTqEeW50dEfV7kAUw" type="CompositeStructure" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_2LYdYJTqEeW50dEfV7kAUw" type="2073">
+    <children xmi:type="notation:Shape" xmi:id="_2LYdYJTqEeW50dEfV7kAUw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_2LYdYpTqEeW50dEfV7kAUw" type="5156"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_2LYdY5TqEeW50dEfV7kAUw" type="6089">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_2LYdZJTqEeW50dEfV7kAUw" y="5"/>
@@ -31,7 +31,7 @@
         <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3W_785TqEeW50dEfV7kAUw"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_6K5m8JTqEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_6K5m8JTqEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_6K5m8pTqEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_6K5m85TqEeW50dEfV7kAUw" x="23" y="-14"/>
         </children>
@@ -41,7 +41,7 @@
         <element xmi:type="uml:Port" href="model.uml#_4LjlYJTqEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6K5m8ZTqEeW50dEfV7kAUw" y="58" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_7RVDgJTqEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_7RVDgJTqEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_7RVDgpTqEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_7RVqkJTqEeW50dEfV7kAUw" x="25" y="3"/>
         </children>
@@ -51,7 +51,7 @@
         <element xmi:type="uml:Port" href="model.uml#_6rNesJTqEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RVDgZTqEeW50dEfV7kAUw" x="43" y="113" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_8P6ysJTqEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_8P6ysJTqEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_8P8A0JTqEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_8P8A0ZTqEeW50dEfV7kAUw" x="25" y="3"/>
         </children>
@@ -61,7 +61,7 @@
         <element xmi:type="uml:Port" href="model.uml#_7rMVAJTqEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P6ysZTqEeW50dEfV7kAUw" y="178" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_9ELhMJTqEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_9ELhMJTqEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_9ELhMpTqEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_9EMIQJTqEeW50dEfV7kAUw" x="25" y="3"/>
         </children>
@@ -71,7 +71,7 @@
         <element xmi:type="uml:Port" href="model.uml#_8bB2gJTqEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ELhMZTqEeW50dEfV7kAUw" x="490" y="199" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_91TcIJTqEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_91TcIJTqEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_91UDMJTqEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_91UDMZTqEeW50dEfV7kAUw" x="25" y="3"/>
         </children>
@@ -81,7 +81,7 @@
         <element xmi:type="uml:Port" href="model.uml#_9SfqAJTqEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_91TcIZTqEeW50dEfV7kAUw" x="348" y="83" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_j_Ni4JUhEeW98PTE4--NLw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_j_Ni4JUhEeW98PTE4--NLw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_j_OxAJUhEeW98PTE4--NLw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_j_OxAZUhEeW98PTE4--NLw" x="25" y="3"/>
         </children>
@@ -91,7 +91,7 @@
         <element xmi:type="uml:Port" href="model.uml#_jWNpMJUhEeW98PTE4--NLw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j_Ni4ZUhEeW98PTE4--NLw" x="432" y="140" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_no60gJUhEeW98PTE4--NLw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_no60gJUhEeW98PTE4--NLw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_no7bkJUhEeW98PTE4--NLw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_no7bkZUhEeW98PTE4--NLw" x="16" y="22"/>
         </children>
@@ -239,13 +239,13 @@
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_uujC9pTrEeW50dEfV7kAUw" type="CompositeStructure" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_uujC95TrEeW50dEfV7kAUw" type="2073">
+    <children xmi:type="notation:Shape" xmi:id="_uujC95TrEeW50dEfV7kAUw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_uujC-JTrEeW50dEfV7kAUw" type="5156"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_uujC-ZTrEeW50dEfV7kAUw" type="6089">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_uujC-pTrEeW50dEfV7kAUw" y="5"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_uujC-5TrEeW50dEfV7kAUw" type="7073">
-        <children xmi:type="notation:Shape" xmi:id="_x7OaUJTrEeW50dEfV7kAUw" type="3070">
+        <children xmi:type="notation:Shape" xmi:id="_x7OaUJTrEeW50dEfV7kAUw" type="Property_Shape">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x_hEcJTrEeW50dEfV7kAUw" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_hEcZTrEeW50dEfV7kAUw" key="mutable" value="true"/>
           </eAnnotations>
@@ -257,7 +257,7 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_x7OaVpTrEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7OaV5TrEeW50dEfV7kAUw"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_x7Ug8JTrEeW50dEfV7kAUw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_x7Ug8JTrEeW50dEfV7kAUw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_x7Ug8pTrEeW50dEfV7kAUw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x7Ug85TrEeW50dEfV7kAUw" x="26" y="-18"/>
             </children>
@@ -267,7 +267,7 @@
             <element xmi:type="uml:Port" href="library.uml#_QuskAJTrEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7Ug8ZTrEeW50dEfV7kAUw" x="-10" y="-10" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_x7zCEJTrEeW50dEfV7kAUw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_x7zCEJTrEeW50dEfV7kAUw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_x7zCEpTrEeW50dEfV7kAUw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x7zCE5TrEeW50dEfV7kAUw" x="-242" y="1"/>
             </children>
@@ -277,7 +277,7 @@
             <element xmi:type="uml:Port" href="library.uml#_WiMMoJTrEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7zCEZTrEeW50dEfV7kAUw" y="43" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_x7zCFpTrEeW50dEfV7kAUw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_x7zCFpTrEeW50dEfV7kAUw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_x7zCGJTrEeW50dEfV7kAUw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x7zCGZTrEeW50dEfV7kAUw" x="-1" y="-21"/>
             </children>
@@ -308,7 +308,7 @@
             <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_EQwT4EhOEeO0lv5O1DTHOQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x8FWD5TrEeW50dEfV7kAUw"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_x8LckJTrEeW50dEfV7kAUw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_x8LckJTrEeW50dEfV7kAUw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_x8LckpTrEeW50dEfV7kAUw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x8Lck5TrEeW50dEfV7kAUw" x="25" y="3"/>
             </children>
@@ -318,7 +318,7 @@
             <element xmi:type="uml:Port" href="library.uml#_VpBwAJTrEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x8LckZTrEeW50dEfV7kAUw" x="194" y="38" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_x8RjMJTrEeW50dEfV7kAUw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_x8RjMJTrEeW50dEfV7kAUw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_x8RjMpTrEeW50dEfV7kAUw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x8RjM5TrEeW50dEfV7kAUw" x="25" y="3"/>
             </children>
@@ -328,7 +328,7 @@
             <element xmi:type="uml:Port" href="library.uml#_YLa0QJTrEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x8RjMZTrEeW50dEfV7kAUw" x="23" y="86" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_--P8MJUhEeW98PTE4--NLw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_--P8MJUhEeW98PTE4--NLw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_--P8MpUhEeW98PTE4--NLw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_--P8M5UhEeW98PTE4--NLw" x="-33" y="29"/>
             </children>
@@ -338,7 +338,7 @@
             <element xmi:type="uml:Port" href="library.uml#_tXMl8JUhEeW98PTE4--NLw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_--P8MZUhEeW98PTE4--NLw" x="39" y="111" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="__Gl_4JUhEeW98PTE4--NLw" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="__Gl_4JUhEeW98PTE4--NLw" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="__Gl_4pUhEeW98PTE4--NLw" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="__Gl_45UhEeW98PTE4--NLw" x="41" y="26"/>
             </children>
@@ -351,7 +351,7 @@
           <element xmi:type="uml:Property" href="model.uml#_xFbawJTrEeW50dEfV7kAUw"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7OaUZTrEeW50dEfV7kAUw" x="222" y="353" width="194" height="111"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_-A2nkJy7EeWzdt_55Z9oIQ" type="3070">
+        <children xmi:type="notation:Shape" xmi:id="_-A2nkJy7EeWzdt_55Z9oIQ" type="Property_Shape">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-QJn0Jy7EeWzdt_55Z9oIQ" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-QJn0Zy7EeWzdt_55Z9oIQ" key="mutable" value="true"/>
           </eAnnotations>
@@ -363,7 +363,7 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_-BAYkZy7EeWzdt_55Z9oIQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BAYkpy7EeWzdt_55Z9oIQ"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-BjyMJy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-BjyMJy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-BkZQJy7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-BkZQZy7EeWzdt_55Z9oIQ" y="-29"/>
             </children>
@@ -373,7 +373,7 @@
             <element xmi:type="uml:Port" href="model.uml#_4LjlYJTqEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BjyMZy7EeWzdt_55Z9oIQ" x="167" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-BpRwJy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-BpRwJy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-BpRwpy7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-BpRw5y7EeWzdt_55Z9oIQ" x="-9" y="-43"/>
             </children>
@@ -383,7 +383,7 @@
             <element xmi:type="uml:Port" href="model.uml#_7rMVAJTqEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BpRwZy7EeWzdt_55Z9oIQ" y="17" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-Bqf4Jy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-Bqf4Jy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-BrG8Jy7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-BrG8Zy7EeWzdt_55Z9oIQ" x="-28" y="50"/>
             </children>
@@ -393,7 +393,7 @@
             <element xmi:type="uml:Port" href="model.uml#_8bB2gJTqEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Bqf4Zy7EeWzdt_55Z9oIQ" y="93" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-Bv_cJy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-Bv_cJy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-BwmgJy7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-BwmgZy7EeWzdt_55Z9oIQ" x="25" y="-28"/>
             </children>
@@ -424,7 +424,7 @@
             <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_EQwT4EhOEeO0lv5O1DTHOQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-C0Wc5y7EeWzdt_55Z9oIQ"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-DDnAJy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-DDnAJy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-DDnApy7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-DE1IJy7EeWzdt_55Z9oIQ" x="17" y="27"/>
             </children>
@@ -434,7 +434,7 @@
             <element xmi:type="uml:Port" href="model.uml#_6rNesJTqEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-DDnAZy7EeWzdt_55Z9oIQ" x="57" y="100" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-DMJ4Jy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-DMJ4Jy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-DMJ4py7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-DMJ45y7EeWzdt_55Z9oIQ" x="24" y="-10"/>
             </children>
@@ -444,7 +444,7 @@
             <element xmi:type="uml:Port" href="model.uml#_9SfqAJTqEeW50dEfV7kAUw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-DMJ4Zy7EeWzdt_55Z9oIQ" y="44" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_-DNYAJy7EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_-DNYAJy7EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_-DNYApy7EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_-DNYA5y7EeWzdt_55Z9oIQ" x="25" y="3"/>
             </children>
@@ -454,7 +454,7 @@
             <element xmi:type="uml:Port" href="model.uml#_jWNpMJUhEeW98PTE4--NLw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-DNYAZy7EeWzdt_55Z9oIQ" x="174" y="100" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_jQbKoJy-EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_jQbKoJy-EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_jQbKopy-EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_jQbKo5y-EeWzdt_55Z9oIQ" x="25" y="3"/>
             </children>
@@ -464,7 +464,7 @@
             <element xmi:type="uml:Port" href="model.uml#_ims4MJy-EeWzdt_55Z9oIQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQbKoZy-EeWzdt_55Z9oIQ" x="-10" y="-10" width="20" height="20"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_l-14sJy-EeWzdt_55Z9oIQ" type="3069">
+          <children xmi:type="notation:Shape" xmi:id="_l-14sJy-EeWzdt_55Z9oIQ" type="Port_Shape">
             <children xmi:type="notation:DecorationNode" xmi:id="_l-2fwJy-EeWzdt_55Z9oIQ" type="5125">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_l-2fwZy-EeWzdt_55Z9oIQ" x="25" y="3"/>
             </children>
@@ -501,7 +501,7 @@
         <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDC5TrEeW50dEfV7kAUw"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_uujDDJTrEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_uujDDJTrEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_uujDDZTrEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDDpTrEeW50dEfV7kAUw" x="23" y="-14"/>
         </children>
@@ -511,7 +511,7 @@
         <element xmi:type="uml:Port" href="model.uml#_uujC8ZTrEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDM5TrEeW50dEfV7kAUw" y="58" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_uujDNJTrEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_uujDNJTrEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_uujDNZTrEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDNpTrEeW50dEfV7kAUw" x="16" y="-11"/>
         </children>
@@ -521,7 +521,7 @@
         <element xmi:type="uml:Port" href="model.uml#_uujC8pTrEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDW5TrEeW50dEfV7kAUw" x="605" y="344" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_uujDXJTrEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_uujDXJTrEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_uujDXZTrEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDXpTrEeW50dEfV7kAUw" x="25" y="3"/>
         </children>
@@ -531,7 +531,7 @@
         <element xmi:type="uml:Port" href="model.uml#_uujC85TrEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDg5TrEeW50dEfV7kAUw" y="465" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_uujDhJTrEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_uujDhJTrEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_uujDhZTrEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDhpTrEeW50dEfV7kAUw" x="25" y="3"/>
         </children>
@@ -541,7 +541,7 @@
         <element xmi:type="uml:Port" href="model.uml#_uujC9JTrEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDq5TrEeW50dEfV7kAUw" x="616" y="490" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_uujDrJTrEeW50dEfV7kAUw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_uujDrJTrEeW50dEfV7kAUw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_uujDrZTrEeW50dEfV7kAUw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDrpTrEeW50dEfV7kAUw" x="3" y="23"/>
         </children>
@@ -551,7 +551,7 @@
         <element xmi:type="uml:Port" href="model.uml#_uujC9ZTrEeW50dEfV7kAUw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujD05TrEeW50dEfV7kAUw" x="372" y="159" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_CceWkJUiEeW98PTE4--NLw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_CceWkJUiEeW98PTE4--NLw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_Cce9oJUiEeW98PTE4--NLw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Cce9oZUiEeW98PTE4--NLw" x="25" y="3"/>
         </children>
@@ -561,7 +561,7 @@
         <element xmi:type="uml:Port" href="model.uml#_B3KqEJUiEeW98PTE4--NLw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CceWkZUiEeW98PTE4--NLw" x="753" y="224" width="20" height="20"/>
       </children>
-      <children xmi:type="notation:Shape" xmi:id="_FSStIJUiEeW98PTE4--NLw" type="3069">
+      <children xmi:type="notation:Shape" xmi:id="_FSStIJUiEeW98PTE4--NLw" type="Port_Shape">
         <children xmi:type="notation:DecorationNode" xmi:id="_FSTUMJUiEeW98PTE4--NLw" type="5125">
           <layoutConstraint xmi:type="notation:Location" xmi:id="_FSTUMZUiEeW98PTE4--NLw" x="25" y="3"/>
         </children>
@@ -669,7 +669,7 @@
       <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/configuration/UMLRT.configuration#_Z79eQHcZEeSnWeKqQOfW2A"/>
     </styles>
     <element xmi:type="uml:Class" href="model.uml#_uujC8JTrEeW50dEfV7kAUw"/>
-    <edges xmi:type="notation:Connector" xmi:id="_4HyqQJTrEeW50dEfV7kAUw" type="4013" source="_uujDDJTrEeW50dEfV7kAUw" target="_x7Ug8JTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_4HyqQJTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDDJTrEeW50dEfV7kAUw" target="_x7Ug8JTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_4HyqQ5TrEeW50dEfV7kAUw" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_4HyqRJTrEeW50dEfV7kAUw" y="60"/>
       </children>
@@ -688,7 +688,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JsuwJTrEeW50dEfV7kAUw" id="(0.85,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JsuwZTrEeW50dEfV7kAUw" id="(0.0,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_4-iFAJTrEeW50dEfV7kAUw" type="4013" source="_uujDXJTrEeW50dEfV7kAUw" target="_x7zCEJTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_4-iFAJTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDXJTrEeW50dEfV7kAUw" target="_x7zCEJTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_4-iFA5TrEeW50dEfV7kAUw" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_4-iFBJTrEeW50dEfV7kAUw" y="60"/>
       </children>
@@ -707,7 +707,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4_3hwJTrEeW50dEfV7kAUw" id="(1.0,0.8)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4_3hwZTrEeW50dEfV7kAUw" id="(0.0,0.2)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_50_L4JTrEeW50dEfV7kAUw" type="4013" source="_uujDhJTrEeW50dEfV7kAUw" target="_x7zCFpTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_50_L4JTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDhJTrEeW50dEfV7kAUw" target="_x7zCFpTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_51FSgJTrEeW50dEfV7kAUw" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_51FSgZTrEeW50dEfV7kAUw" y="60"/>
       </children>
@@ -726,7 +726,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_52m8gJTrEeW50dEfV7kAUw" id="(0.0,0.6)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_52m8gZTrEeW50dEfV7kAUw" id="(1.0,0.4)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_7QxNYJTrEeW50dEfV7kAUw" type="4013" source="_uujDNJTrEeW50dEfV7kAUw" target="_x8LckJTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_7QxNYJTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDNJTrEeW50dEfV7kAUw" target="_x8LckJTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_7QxNY5TrEeW50dEfV7kAUw" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_7QxNZJTrEeW50dEfV7kAUw" y="60"/>
       </children>
@@ -745,7 +745,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7SY-AJTrEeW50dEfV7kAUw" id="(0.55,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7SY-AZTrEeW50dEfV7kAUw" id="(1.0,0.5)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_WLwFUJy8EeWzdt_55Z9oIQ" type="4013" source="_-BjyMJy7EeWzdt_55Z9oIQ" target="_uujDDJTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_WLwFUJy8EeWzdt_55Z9oIQ" type="Connector_Edge" source="_-BjyMJy7EeWzdt_55Z9oIQ" target="_uujDDJTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_WLwFU5y8EeWzdt_55Z9oIQ" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WLwFVJy8EeWzdt_55Z9oIQ" y="60"/>
       </children>
@@ -764,7 +764,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WPsKIJy8EeWzdt_55Z9oIQ" id="(0.0,0.3)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WPsKIZy8EeWzdt_55Z9oIQ" id="(1.0,0.55)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_agtTYJy8EeWzdt_55Z9oIQ" type="4013" source="_-BpRwJy7EeWzdt_55Z9oIQ" target="_uujDXJTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_agtTYJy8EeWzdt_55Z9oIQ" type="Connector_Edge" source="_-BpRwJy7EeWzdt_55Z9oIQ" target="_uujDXJTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_aguhgJy8EeWzdt_55Z9oIQ" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_aguhgZy8EeWzdt_55Z9oIQ" y="60"/>
       </children>
@@ -783,7 +783,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_akEwcJy8EeWzdt_55Z9oIQ" id="(0.0,0.95)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_akEwcZy8EeWzdt_55Z9oIQ" id="(0.9,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_d3RmkJy8EeWzdt_55Z9oIQ" type="4013" source="_-DDnAJy7EeWzdt_55Z9oIQ" target="_uujDNJTrEeW50dEfV7kAUw">
+    <edges xmi:type="notation:Connector" xmi:id="_d3RmkJy8EeWzdt_55Z9oIQ" type="Connector_Edge" source="_-DDnAJy7EeWzdt_55Z9oIQ" target="_uujDNJTrEeW50dEfV7kAUw">
       <children xmi:type="notation:DecorationNode" xmi:id="_d3SNoJy8EeWzdt_55Z9oIQ" type="6025">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_d3SNoZy8EeWzdt_55Z9oIQ" y="60"/>
       </children>
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java
new file mode 100644
index 000000000..14be0f9fd
--- /dev/null
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST 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:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.Diagnostician;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Assert;
+
+/**
+ * Abstract test class for all EMF-based configuration models (property view, palettes, etc.)
+ * 
+ * @deprecated
+ * @use AbstractEMFResourceTest from o.e.p.junit.utils instead (available in Neon M7)
+ */
+public abstract class AbstractEMFResourceTest extends AbstractPapyrusTest {
+
+	/**
+	 * URI of the EMF resource to test
+	 * 
+	 * @return
+	 */
+	public abstract String getFileUri();
+
+	/**
+	 * do the validation checks on the EMF resource
+	 */
+	protected void doValidateResource() {
+		URI createPlatformPluginURI = URI.createPlatformPluginURI(getFileUri(), true);
+		Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true);
+		Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
+		Assert.assertEquals("The constraint model is not valid: " + printDiagnostic(diagnostic), Diagnostic.OK, diagnostic.getSeverity());
+	}
+
+	// FIXME : Something should exist in API to do that
+	protected String printDiagnostic(Diagnostic diagnostic) {
+		String message = diagnostic.getMessage();
+		List<Diagnostic> children = diagnostic.getChildren();
+		for (Diagnostic diagnostic2 : children) {
+			message += "\n" + diagnostic2.getMessage();
+		}
+		return message;
+	}
+}
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
index 476df2dbd..fd3951e93 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
@@ -13,7 +13,6 @@
 
 package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration;
 
-import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest;
 import org.eclipse.papyrusrt.umlrt.tooling.ui.Activator;
 import org.junit.Test;
 
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
index 6e34550aa..2dd92d875 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
@@ -22,10 +22,9 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.junit.Assert;
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
index da0bb0e17..a0bf01956 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration;
 
 import org.eclipse.papyrus.junit.framework.classification.FailingTest;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest;
 import org.eclipse.papyrusrt.umlrt.tooling.properties.Activator;
 import org.junit.Test;
 
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
index e7fc75191..58db2637e 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
@@ -17,8 +17,8 @@ import static org.junit.Assert.fail;
 
 import java.lang.reflect.Method;
 
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.views.properties.modelelement.DataSource;
 import org.junit.Test;
 
 public class ChangeListenerUtilsTest extends AbstractPapyrusTest {
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
index 65242e07d..4fe03534e 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
 import org.eclipse.papyrusrt.umlrt.core.utils.IRealTimeConstants;
 import org.eclipse.papyrusrt.umlrt.core.utils.RTPortKindEnum;
 import org.eclipse.papyrusrt.umlrt.core.utils.RTPortUtils;