From f28c7e2a763a6396141e33c1ec458479c205b938 Mon Sep 17 00:00:00 2001
From: Onder Gurcan
Date: Wed, 18 Feb 2015 13:49:19 +0100
Subject: Bug 460225 - [UML RT] The UI related files of the "umlrt" plug-in
 shall be moved to the "umlrt.ui" plug-in.

Change-Id: I1a481b83e021c1107af009460335dc4ae2b36040
Signed-off-by: Onder Gurcan <onder.gurcan@cea.fr>---
 .../org.eclipse.papyrus.umlrt/build.properties     |  3 +-
 .../configuration/UMLRT.configuration              | 47 ----------
 .../elementtypes/uml-rt.elementtypesconfigurations | 99 ++++++++++++++++++++++
 .../palettes/UML-RT.CapsuleDiagram.Palette.xml     | 48 -----------
 .../palettes/UML-RT.ProtocolDiagram.Palette.xml    | 55 ------------
 .../UML-RT.StateMachineDiagram.Palette.xml         | 68 ---------------
 .../umlrt/org.eclipse.papyrus.umlrt/plugin.xml     | 56 +-----------
 .../umlProfile/newChildMenu.xmi                    | 11 ---
 .../umlProfile/uml-rt.assistants                   | 90 --------------------
 .../umlProfile/uml-rt.elementtypesconfigurations   | 99 ----------------------
 10 files changed, 101 insertions(+), 475 deletions(-)
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/configuration/UMLRT.configuration
 create mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.CapsuleDiagram.Palette.xml
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.ProtocolDiagram.Palette.xml
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.StateMachineDiagram.Palette.xml
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/newChildMenu.xmi
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.assistants
 delete mode 100644 extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.elementtypesconfigurations

(limited to 'extraplugins/umlrt/org.eclipse.papyrus.umlrt')

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/build.properties b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/build.properties
index 09acf495982..0afc3c1ddc1 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/build.properties
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/build.properties
@@ -7,7 +7,6 @@ bin.includes = META-INF/,\
                umlProfile/,\
                about.html,\
                plugin.properties,\
-               configuration/,\
-               palettes/
+               elementtypes/
 src.includes = about.html
 source..=src-gen
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/configuration/UMLRT.configuration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/configuration/UMLRT.configuration
deleted file mode 100644
index e17adce6ac1..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/configuration/UMLRT.configuration
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration 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" xmi:id="_oa8yUBP7EeSS0oyATXohNA" defaultStakeholder="_stSKMBP7EeSS0oyATXohNA">
-  <stakeholders xmi:id="_stSKMBP7EeSS0oyATXohNA" name="MetaModeler" viewpoints="_3T-cEBP7EeSS0oyATXohNA"/>
-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_3T-cEBP7EeSS0oyATXohNA" name="UMLRT Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_Z79eQHcZEeSnWeKqQOfW2A" name="UML-RT Capsule Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="CompositeStructure" categories="_vUL7ABP7EeSS0oyATXohNA" customPalette="" customStyle="">
-      <modelRules xmi:id="_I9zbAHk9EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_85OAcHcbEeSvwMs-oU2KZg">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <owningRules xmi:id="_0YJbEHk7EeSk0Zv84QxXew">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </owningRules>
-      <childRules xmi:id="_J1gfEHk9EeSk0Zv84QxXew"/>
-      <paletteRules xmi:id="_J1gfEXk9EeSk0Zv84QxXew" permit="false" element="clazz.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_76zNAHljEeStRMMIACKMpA" name="UML-RT Protocol Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" categories="_vUL7ABP7EeSS0oyATXohNA" customPalette="" customStyle="">
-      <modelRules xmi:id="_76zNAXljEeStRMMIACKMpA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_76zNAnljEeStRMMIACKMpA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <owningRules xmi:id="_76zNA3ljEeStRMMIACKMpA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </owningRules>
-      <childRules xmi:id="_76zNBHljEeStRMMIACKMpA"/>
-      <paletteRules xmi:id="_76zNBXljEeStRMMIACKMpA" permit="false" element="clazz.group.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_z7jvYHowEeShz4kBD-O00g" name="UML-RT StateMachine Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLStateMachineDiagram" categories="_vUL7ABP7EeSS0oyATXohNA" customPalette="" customStyle="">
-      <modelRules xmi:id="_z7jvYXowEeShz4kBD-O00g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_z7jvYnowEeShz4kBD-O00g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <owningRules xmi:id="_z7jvY3owEeShz4kBD-O00g">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </owningRules>
-      <childRules xmi:id="_z7jvZHowEeShz4kBD-O00g"/>
-      <paletteRules xmi:id="_z7jvZXowEeShz4kBD-O00g" permit="false" element="clazz.group.*"/>
-    </modelKinds>
-  </viewpoints>
-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-  <categories xmi:id="_vUL7ABP7EeSS0oyATXohNA" name="uml"/>
-</configuration:PapyrusConfiguration>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
new file mode 100644
index 00000000000..48ffceb8b17
--- /dev/null
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" name="UMLRealTime" identifier="org.eclipse.papyrus.umlrt.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" name="Capsule" identifier="org.eclipse.papyrus.umlrt.Capsule">
+    <iconEntry xmi:id="_ubJcsqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJctKeUEeSUR5jX0TaAcA" name="CapsulePart" identifier="org.eclipse.papyrus.umlrt.CapsulePart">
+    <iconEntry xmi:id="_ubJctaeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJctqeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJct6eUEeSUR5jX0TaAcA" name="Protocol" identifier="org.eclipse.papyrus.umlrt.Protocol">
+    <iconEntry xmi:id="_ubJcuKeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcuaeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcuqeUEeSUR5jX0TaAcA" name="RTPort" identifier="org.eclipse.papyrus.umlrt.RTPort">
+    <iconEntry xmi:id="_ubJcu6eUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcvKeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcvaeUEeSUR5jX0TaAcA" name="RTConnector" identifier="org.eclipse.papyrus.umlrt.RTConnector">
+    <iconEntry xmi:id="_ubJcvqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcv6eUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTConnector</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcwKeUEeSUR5jX0TaAcA" name="ProtocolContainer" identifier="org.eclipse.papyrus.umlrt.ProtocolContainer">
+    <iconEntry xmi:id="_ubJcwaeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcwqeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcw6eUEeSUR5jX0TaAcA" name="RTRExcludedElement" identifier="org.eclipse.papyrus.umlrt.RTRExcludedElement">
+    <iconEntry xmi:id="_ubJcxKeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/RedefinableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcxaeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTRExcludedElement</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcxqeUEeSUR5jX0TaAcA" name="RTMessageSet" identifier="org.eclipse.papyrus.umlrt.RTMessageSet">
+    <iconEntry xmi:id="_ubJcx6eUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
+    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcyKeUEeSUR5jX0TaAcA">
+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
+    </matcherConfiguration>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" name="Apply Capsule" identifier="org.eclipse.papyrus.umlrt.capsule" target="_ubJcsaeUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::Capsule" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcy6eUEeSUR5jX0TaAcA" name="Apply CapsulePart" identifier="org.eclipse.papyrus.umlrt.capsulePart" target="_ubJctKeUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJczKeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::CapsulePart" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJczaeUEeSUR5jX0TaAcA" name="Apply Protocol" identifier="org.eclipse.papyrus.umlrt.protocol" target="_ubJct6eUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJczqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::Protocol" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcz6eUEeSUR5jX0TaAcA" name="Apply RTPort" identifier="org.eclipse.papyrus.umlrt.rTPort" target="_ubJcuqeUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJc0KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTPort" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc0aeUEeSUR5jX0TaAcA" name="Apply RTConnector" identifier="org.eclipse.papyrus.umlrt.rTConnector" target="_ubJcvaeUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJc0qeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTConnector" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc06eUEeSUR5jX0TaAcA" name="Apply ProtocolContainer" identifier="org.eclipse.papyrus.umlrt.protocolContainer" target="_ubJcwKeUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJc1KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::ProtocolContainer" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc1aeUEeSUR5jX0TaAcA" name="Apply RTRExcludedElement" identifier="org.eclipse.papyrus.umlrt.rTRExcludedElement" target="_ubJcw6eUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJc1qeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc16eUEeSUR5jX0TaAcA" name="Apply RTMessageSet" identifier="org.eclipse.papyrus.umlrt.rTMessageSet" target="_ubJcxqeUEeSUR5jX0TaAcA">
+    <stereotypesToApply xmi:id="_ubJc2KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTMessageSet" updateName="true">
+      <requiredProfiles>UMLRealTime</requiredProfiles>
+    </stereotypesToApply>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.CapsuleDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.CapsuleDiagram.Palette.xml
deleted file mode 100644
index 0340aec0038..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.CapsuleDiagram.Palette.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1417096439749"
-			name="UML-RT">
-			<aspectTool description="Create a Capsule"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				id="composite.tool.class_1417096476020" name="Capsule"
-				refToolId="composite.tool.class">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::Capsule" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a CapsulePart"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				id="composite.tool.property_1417096489619" name="CapsulePart"
-				refToolId="composite.tool.property">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::CapsulePart" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>				
-			<aspectTool description="Create an RTConnector"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-				id="composite.tool.connector_1417096565130" name="RTConnector"
-				refToolId="composite.tool.connector">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTConnector" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>			
-			<aspectTool description="Create an RTPort"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-				id="composite.tool.port_1417096575355" name="RTPort"
-				refToolId="composite.tool.port">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTPort" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.ProtocolDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.ProtocolDiagram.Palette.xml
deleted file mode 100644
index 83c439d0d40..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.ProtocolDiagram.Palette.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif"  id="Drawer__1416993599968"
-			name="UML-RT">			
-			<aspectTool description="Create a ProtocolContainer"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				id="clazz.tool.package_1416993803624" name="ProtocolContainer"
-				refToolId="clazz.tool.package">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::ProtocolContainer" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a Protocol"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				id="composite.tool.collaboration_1417096522723" name="Protocol"
-				refToolId="composite.tool.collaboration">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::Protocol" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>		
-			<aspectTool description="Create an RTMessageSet"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-				id="clazz.tool.interface_1416994043249" name="RTMessageSet"
-				refToolId="clazz.tool.interface">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTMessageSet" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an RTTrigger"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-				id="clazz.tool.operation_1416994043249" name="RTTrigger"
-				refToolId="clazz.tool.operation">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTTrigger" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create a Realization"
-				iconpath="bundleentry://1075.fwk31149847/icons/full/obj16/Realization.gif"
-				id="clazz.tool.realization_1417455608460" name="Realization"
-				refToolId="clazz.tool.realization" />	
-			<aspectTool description="Create an Usage"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				id="clazz.tool.usage_1417516786109" name="Usage" refToolId="clazz.tool.usage" />			
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.StateMachineDiagram.Palette.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.StateMachineDiagram.Palette.xml
deleted file mode 100644
index 501fbb32678..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/palettes/UML-RT.StateMachineDiagram.Palette.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="Drawer__1416993599969"
-			name="UML-RT">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				id="createStateMachineCreationTool_1416993776146" name="RTStateMachine"
-				refToolId="createStateMachineCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTStateMachine" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"
-				id="createRegionCreationTool_1416993785626" name="RTRegion"
-				refToolId="createRegionCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTRegion" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				id="createPseudostateCreationTool_1416993803624" name="RTPseudostate"
-				refToolId="createPseudostateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTPseudostate" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				id="createTriggerCreationTool_1416993803625" name="RTTrigger"
-				refToolId="createTriggerCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTimeStateMach::RTTrigger" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>			
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
-				id="createStateCreationTool_1416994043249" name="RTState (State)"
-				refToolId="createStateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTState" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
-				id="createFinalStateCreationTool_1416994043249" name="RTState (Final State)"
-				refToolId="createFinalStateCreationTool">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="UMLRealTime::RTState" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
index 890db144544..bf4f7117a82 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
@@ -53,54 +53,6 @@
             provider="Eclipse Modeling Project">
       </profile>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-Composite-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-CompositeDiagramPaletteExtension"
-            path="palettes/UML-RT.CapsuleDiagram.Palette.xml">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-Class-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-ClassDiagramPaletteExtension"
-            path="palettes/UML-RT.ProtocolDiagram.Palette.xml">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="UML-RT-StateMachine-PE"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="UML-RT-StateMachineDiagramPaletteExtension"
-            path="palettes/UML-RT.StateMachineDiagram.Palette.xml">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.statemachine">
-         </editor>
-      </paletteDefinition>
-   </extension>
    <extension
          point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
       <configuration
@@ -108,17 +60,11 @@
             priority="100">
       </configuration>
    </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.newchild">
-      <menuCreationModel
-            model="umlProfile/newChildMenu.xmi">
-      </menuCreationModel>
-   </extension>
    <extension
          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
       <elementTypeSet
             id="org.eclipse.papyrus.umlrt.elementTypeSet"
-            path="umlProfile/uml-rt.elementtypesconfigurations">
+            path="elementtypes/uml-rt.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
 
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/newChildMenu.xmi b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/newChildMenu.xmi
deleted file mode 100644
index 59bbbef6f95..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/newChildMenu.xmi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ElementCreationMenuModel:Folder xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" label="UMLRealTime">
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Capsule" elementTypeIdRef="org.eclipse.papyrus.umlrt.Capsule"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="CapsulePart" elementTypeIdRef="org.eclipse.papyrus.umlrt.CapsulePart"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="Protocol" elementTypeIdRef="org.eclipse.papyrus.umlrt.Protocol"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTPort" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTPort"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTConnector" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTConnector"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="ProtocolContainer" elementTypeIdRef="org.eclipse.papyrus.umlrt.ProtocolContainer"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTRExcludedElement" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTRExcludedElement"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu" label="RTMessageSet" elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageSet"/>
-</ElementCreationMenuModel:Folder>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.assistants b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.assistants
deleted file mode 100644
index 2650527713c..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.assistants
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xmlns:umlfilters="http://www.eclipse.org/Papyrus/2014/uml/filters" name="UMLRealTime">
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Activity" elementTypeID="org.eclipse.papyrus.uml.Activity"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::AssociationClass" elementTypeID="org.eclipse.papyrus.uml.AssociationClass"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Behavior" elementTypeID="org.eclipse.papyrus.uml.Behavior"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Class" elementTypeID="org.eclipse.papyrus.uml.Class"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::ClassifierTemplateParameter" elementTypeID="org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Component" elementTypeID="org.eclipse.papyrus.uml.Component"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::ConnectableElementTemplateParameter" elementTypeID="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Device" elementTypeID="org.eclipse.papyrus.uml.Device"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::ExecutionEnvironment" elementTypeID="org.eclipse.papyrus.uml.ExecutionEnvironment"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::FunctionBehavior" elementTypeID="org.eclipse.papyrus.uml.FunctionBehavior"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Interaction" elementTypeID="org.eclipse.papyrus.uml.Interaction"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Interface" elementTypeID="org.eclipse.papyrus.uml.Interface"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Model" elementTypeID="org.eclipse.papyrus.uml.Model"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Node" elementTypeID="org.eclipse.papyrus.uml.Node"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::OpaqueBehavior" elementTypeID="org.eclipse.papyrus.uml.OpaqueBehavior"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::OperationTemplateParameter" elementTypeID="org.eclipse.papyrus.uml.OperationTemplateParameter"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Package" elementTypeID="org.eclipse.papyrus.uml.Package"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Profile" elementTypeID="org.eclipse.papyrus.uml.Profile"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::ProtocolStateMachine" elementTypeID="org.eclipse.papyrus.uml.ProtocolStateMachine"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::StateMachine" elementTypeID="org.eclipse.papyrus.uml.StateMachine"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Stereotype" elementTypeID="org.eclipse.papyrus.uml.Stereotype"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::TemplateParameter" elementTypeID="org.eclipse.papyrus.uml.TemplateParameter"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::TemplateParameterSubstitution" elementTypeID="org.eclipse.papyrus.uml.TemplateParameterSubstitution"/>
-  <ownedFilter xsi:type="filters:CompoundFilter" name="pertains to Profile UMLRealTime" filter="//@ownedFilter.23/@ownedFilter.0 //@ownedFilter.23/@ownedFilter.1" operator="or">
-    <ownedFilter xsi:type="umlfilters:ProfileApplied" name="UMLRealTime is applied in context" profileQualifiedName="UMLRealTime" profileURI="platform:/resource/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.profile.uml#_1h74oEeVEeO0lv5O1DTHOQ"/>
-    <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>
-  </ownedFilter>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Artifact" elementTypeID="org.eclipse.papyrus.uml.Artifact"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::AssociationBase" elementTypeID="org.eclipse.papyrus.uml.AssociationBase"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Association" elementTypeID="org.eclipse.papyrus.uml.Association"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Collaboration" elementTypeID="org.eclipse.papyrus.uml.Collaboration"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::CommunicationPath" elementTypeID="org.eclipse.papyrus.uml.CommunicationPath"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::DataType" elementTypeID="org.eclipse.papyrus.uml.DataType"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::DeploymentSpecification" elementTypeID="org.eclipse.papyrus.uml.DeploymentSpecification"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::EncapsulatedClassifier" elementTypeID="org.eclipse.papyrus.uml.EncapsulatedClassifier"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Enumeration" elementTypeID="org.eclipse.papyrus.uml.Enumeration"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Extension" elementTypeID="org.eclipse.papyrus.uml.Extension"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::ExtensionEnd" elementTypeID="org.eclipse.papyrus.uml.ExtensionEnd"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Port" elementTypeID="org.eclipse.papyrus.uml.Port"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::PrimitiveType" elementTypeID="org.eclipse.papyrus.uml.PrimitiveType"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Property" elementTypeID="org.eclipse.papyrus.uml.Property"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::Signal" elementTypeID="org.eclipse.papyrus.uml.Signal"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="UML::StructuredClassifier" elementTypeID="org.eclipse.papyrus.uml.StructuredClassifier"/>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.Capsule" filter="//@popupAssistant.0/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.0/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.0 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.7 //@ownedFilter.8 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.11 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.16 //@ownedFilter.17 //@ownedFilter.18 //@ownedFilter.19 //@ownedFilter.20 //@ownedFilter.21 //@ownedFilter.22" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.CapsulePart" filter="//@popupAssistant.1/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.1/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.0 //@ownedFilter.24 //@ownedFilter.25 //@ownedFilter.26 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.27 //@ownedFilter.28 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.29 //@ownedFilter.30 //@ownedFilter.7 //@ownedFilter.31 //@ownedFilter.32 //@ownedFilter.8 //@ownedFilter.33 //@ownedFilter.34 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.11 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.35 //@ownedFilter.36 //@ownedFilter.37 //@ownedFilter.18 //@ownedFilter.38 //@ownedFilter.19 //@ownedFilter.20 //@ownedFilter.39 //@ownedFilter.21 //@ownedFilter.22" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.Protocol" filter="//@popupAssistant.2/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.2/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.0 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.7 //@ownedFilter.8 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.11 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.16 //@ownedFilter.17 //@ownedFilter.18 //@ownedFilter.19 //@ownedFilter.20 //@ownedFilter.21 //@ownedFilter.22" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.RTPort" filter="//@popupAssistant.3/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.3/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.0 //@ownedFilter.24 //@ownedFilter.25 //@ownedFilter.26 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.27 //@ownedFilter.28 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.29 //@ownedFilter.30 //@ownedFilter.7 //@ownedFilter.31 //@ownedFilter.32 //@ownedFilter.8 //@ownedFilter.33 //@ownedFilter.34 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.11 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.35 //@ownedFilter.36 //@ownedFilter.37 //@ownedFilter.18 //@ownedFilter.38 //@ownedFilter.19 //@ownedFilter.20 //@ownedFilter.39 //@ownedFilter.21 //@ownedFilter.22" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.RTConnector" filter="//@popupAssistant.4/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.4/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.0 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.27 //@ownedFilter.5 //@ownedFilter.7 //@ownedFilter.31 //@ownedFilter.8 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.18 //@ownedFilter.19 //@ownedFilter.20 //@ownedFilter.39" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.ProtocolContainer" filter="//@popupAssistant.5/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.5/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.12 //@ownedFilter.15 //@ownedFilter.16 //@ownedFilter.17 //@ownedFilter.21 //@ownedFilter.22" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.RTRExcludedElement"/>
-  <popupAssistant elementTypeID="org.eclipse.papyrus.umlrt.RTMessageSet" filter="//@popupAssistant.7/@ownedFilter">
-    <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.23 //@popupAssistant.7/@ownedFilter/@ownedFilter.0">
-      <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.0 //@ownedFilter.1 //@ownedFilter.2 //@ownedFilter.3 //@ownedFilter.4 //@ownedFilter.5 //@ownedFilter.6 //@ownedFilter.7 //@ownedFilter.8 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.11 //@ownedFilter.12 //@ownedFilter.13 //@ownedFilter.14 //@ownedFilter.15 //@ownedFilter.16 //@ownedFilter.17 //@ownedFilter.18 //@ownedFilter.19 //@ownedFilter.20 //@ownedFilter.21 //@ownedFilter.22" operator="or"/>
-    </ownedFilter>
-  </popupAssistant>
-  <elementTypeID>org.eclipse.papyrus.umlrt.Capsule</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.CapsulePart</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.Protocol</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.RTPort</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.RTConnector</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.ProtocolContainer</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.RTRExcludedElement</elementTypeID>
-  <elementTypeID>org.eclipse.papyrus.umlrt.RTMessageSet</elementTypeID>
-</assistant:ModelingAssistantProvider>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.elementtypesconfigurations
deleted file mode 100644
index 48ffceb8b17..00000000000
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/uml-rt.elementtypesconfigurations
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" name="UMLRealTime" identifier="org.eclipse.papyrus.umlrt.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" name="Capsule" identifier="org.eclipse.papyrus.umlrt.Capsule">
-    <iconEntry xmi:id="_ubJcsqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJctKeUEeSUR5jX0TaAcA" name="CapsulePart" identifier="org.eclipse.papyrus.umlrt.CapsulePart">
-    <iconEntry xmi:id="_ubJctaeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJctqeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJct6eUEeSUR5jX0TaAcA" name="Protocol" identifier="org.eclipse.papyrus.umlrt.Protocol">
-    <iconEntry xmi:id="_ubJcuKeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcuaeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcuqeUEeSUR5jX0TaAcA" name="RTPort" identifier="org.eclipse.papyrus.umlrt.RTPort">
-    <iconEntry xmi:id="_ubJcu6eUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcvKeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcvaeUEeSUR5jX0TaAcA" name="RTConnector" identifier="org.eclipse.papyrus.umlrt.RTConnector">
-    <iconEntry xmi:id="_ubJcvqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcv6eUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTConnector</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcwKeUEeSUR5jX0TaAcA" name="ProtocolContainer" identifier="org.eclipse.papyrus.umlrt.ProtocolContainer">
-    <iconEntry xmi:id="_ubJcwaeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcwqeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcw6eUEeSUR5jX0TaAcA" name="RTRExcludedElement" identifier="org.eclipse.papyrus.umlrt.RTRExcludedElement">
-    <iconEntry xmi:id="_ubJcxKeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/RedefinableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcxaeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTRExcludedElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ubJcxqeUEeSUR5jX0TaAcA" name="RTMessageSet" identifier="org.eclipse.papyrus.umlrt.RTMessageSet">
-    <iconEntry xmi:id="_ubJcx6eUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_ubJcyKeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" name="Apply Capsule" identifier="org.eclipse.papyrus.umlrt.capsule" target="_ubJcsaeUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::Capsule" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcy6eUEeSUR5jX0TaAcA" name="Apply CapsulePart" identifier="org.eclipse.papyrus.umlrt.capsulePart" target="_ubJctKeUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJczKeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::CapsulePart" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJczaeUEeSUR5jX0TaAcA" name="Apply Protocol" identifier="org.eclipse.papyrus.umlrt.protocol" target="_ubJct6eUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJczqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::Protocol" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcz6eUEeSUR5jX0TaAcA" name="Apply RTPort" identifier="org.eclipse.papyrus.umlrt.rTPort" target="_ubJcuqeUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJc0KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTPort" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc0aeUEeSUR5jX0TaAcA" name="Apply RTConnector" identifier="org.eclipse.papyrus.umlrt.rTConnector" target="_ubJcvaeUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJc0qeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTConnector" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc06eUEeSUR5jX0TaAcA" name="Apply ProtocolContainer" identifier="org.eclipse.papyrus.umlrt.protocolContainer" target="_ubJcwKeUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJc1KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::ProtocolContainer" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc1aeUEeSUR5jX0TaAcA" name="Apply RTRExcludedElement" identifier="org.eclipse.papyrus.umlrt.rTRExcludedElement" target="_ubJcw6eUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJc1qeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc16eUEeSUR5jX0TaAcA" name="Apply RTMessageSet" identifier="org.eclipse.papyrus.umlrt.rTMessageSet" target="_ubJcxqeUEeSUR5jX0TaAcA">
-    <stereotypesToApply xmi:id="_ubJc2KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTMessageSet" updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
-- 
cgit v1.2.3