Bug 487480 - Refactor elementtypesconfiguration framework

Insert a "oep/infra/types" layer to host the core
elementtypesconfiguration framework. 
Move UML elementtypesconfiguration extensions to "oep/uml"
Move EMF elementtypesconfiguration extensions to "oep/infra/emf"
Move elementtypesconfiguration tests to
oep/tests/junit/plugins/infra/types

Rename all elementtypesconfiguration plugins (core, dev, tests and
extensions) and corresponfing packages to shorter qualifiers as follows: 

oep.infra.elementtypesconfigurations -> oep.infra.types.core and
oep.infra.types
oep.infra.elementtypesconfigurations.edit -> oep.infra.types.edit
oep.infra.elementtypesconfigurations.editor -> oep.infra.types.editor
oep.infra.elementtypesconfigurations.ui -> oep.infra.types.ui

oep.infra.elementtypesconfigurations.invarianttypes ->
oep.infra.types.rulebased

oep.infra.elementtypesconfigurations.emf -> oep.infra.emf.types
oep.infra.elementtypesconfigurations.emf.ui -> oep.infra.emf.types.ui

oep.uml.elementtypesconfigurations -> oep.uml.types

oep.elementtypesconfigurations.developer -> oep.dev.types

oep.infra.elementtypesconfigurations.tests	-> oep.infra.types.tests
oep.infra.elementtypesconfigurations.ui.tests ->
oep.infra.types.ui.tests

Change-Id: Iad7f5689b183e6ad29daab06a1cc2858ee408aa7

3 files changed, 31 insertions, 105 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
index 003d2af13e0..45a58498b8a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  org.eclipse.uml2.uml.profile.standard,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.emf.edit.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
index d4d2919cd0d..10cb930aa7b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
@@ -1,103 +1,29 @@
-<?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:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"
-    name="UML Edit Advices with UI"
-    description="Additional edit advices for UML that implement UI interactions"
-    identifier="org.eclipse.papyrus.uml.service.types.ui.UMLElementTypeUIAdvices"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_R_pDcWT7EeSzFvTXGJPhUg"
-      identifier="org.eclipse.papyrus.uml.ui.advice.ClassifierTemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ClassifierTemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_XzjBAMO1EeWVMJ0KdwVfSA"
-      description=""
-      identifier="org.eclipse.papyrus.uml.ui.advice.CollaborationRole"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.CollaborationCollaborationRoleEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_IsX6UMc9EeS1POoqrCEMrQ"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YO3rEMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.ConnectableElementTemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ConnectableElementTemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_yjhpkJXIEeSmV5hdT3HeBw"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YZtCEMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.Extension"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ExtensionEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScjXoVYCEeS0WsAAtVmToA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YeHoAMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.InformationFlow"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InformationFlowEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ZLpUILgeEeSANYuUIb1qQA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YismAMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.InstanceSpecification.Link"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_bvHrYJXNEeSmV5hdT3HeBw"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YngNgMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.OperationTemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.OperationTemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_vg_QMJXJEeSmV5hdT3HeBw"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YsKrEMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.RoleBinding"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.RoleBindingHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_TFofsLhAEeSANYuUIb1qQA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_Y2rR8MO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.TemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.TemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA"/>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Additional edit advices for UML that implement UI interactions" identifier="org.eclipse.papyrus.uml.service.types.ui.UMLElementTypeUIAdvices" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UML Edit Advices with UI" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ClassifierTemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.ClassifierTemplateParameter" inheritance="all" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.CollaborationCollaborationRoleEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.CollaborationRole" inheritance="all" xmi:id="_XzjBAMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_IsX6UMc9EeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ConnectableElementTemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.ConnectableElementTemplateParameter" inheritance="all" xmi:id="_YO3rEMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_yjhpkJXIEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ExtensionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.Extension" inheritance="all" xmi:id="_YZtCEMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScjXoVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InformationFlowEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.InformationFlow" inheritance="all" xmi:id="_YeHoAMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ZLpUILgeEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.InstanceSpecification.Link" inheritance="all" xmi:id="_YismAMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_bvHrYJXNEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.OperationTemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.OperationTemplateParameter" inheritance="all" xmi:id="_YngNgMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_vg_QMJXJEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.RoleBindingHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.RoleBinding" inheritance="all" xmi:id="_YsKrEMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_TFofsLhAEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.TemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.TemplateParameter" inheritance="all" xmi:id="_Y2rR8MO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
index bda89345dc7..00436a38341 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
@@ -1591,7 +1591,7 @@
 			</image>
  </extension>
  <extension
-       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
     <elementTypeSet
           clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/uml-advice.elementtypesconfigurations">