3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
index 8b0394e22a2..ca92d4543cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
@@ -17,15 +17,15 @@
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_qREM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3070" hint="3070">
     <iconEntry xmi:id="_W_q4IM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_t7cM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3071" hint="3071">
     <iconEntry xmi:id="_W_t7cc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAafAM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_2002" hint="2002">
     <iconEntry xmi:id="_XAafAc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBhSQM2QEeSF96aioTD1kQ" name="Component Realization" identifier="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007" hint="4007">
     <iconEntry xmi:id="_XBhSQc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
index 61e0db0db0f..43fc2bc1394 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
@@ -128,4 +128,10 @@
       <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
     </containerConfiguration>
   </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_haR0kNCrEeSPA6G9EAuxLg" identifier="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" name="org.eclipse.papyrus.uml.Component_As_UML" hint="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement">
+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
+    <containerConfiguration xmi:id="_yePr4NCrEeSPA6G9EAuxLg">
+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Component/packagedElement"/>
+    </containerConfiguration>
+  </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java
index e27f6b32c3a..bd2230f7533 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java
@@ -17,7 +17,6 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;
 import org.eclipse.papyrus.commands.ICreationCommand;
-import org.eclipse.papyrus.junit.framework.classification.FailingTest;
 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;
 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;
 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
@@ -76,7 +75,6 @@ public class TestComponentDiagramComponentChildNode extends TestChildNode {
 		setTestAffixedNode(false);
 	}
 
-	@FailingTest
 	@Test
 	public void testToManageComponent() {
 		testToCreateANode(UMLElementTypes.Component_3070, 0, 0, 1, 1, false, "Component", 0);