- Remove unnecessary feature of deployments

dice-project · Jul 27, 2017 · f830d49 · f830d49
1 parent 9389aef
commit f830d49
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 40 deletions.
diff --git a/dice_papyrus_models/anomaly_detection.uml b/dice_papyrus_models/anomaly_detection.uml
@@ -7,6 +7,6 @@
     <packagedElement xmi:type="uml:Dependency" xmi:id="_xtddoG3pEee-2pFlIsT02Q" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_lN2iUG3pEee-2pFlIsT02Q"/>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_vUKeYHEzEeeTB424yHWZ2g" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_sl7jIG3pEee-2pFlIsT02Q"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Component" xmi:id="_lN2iUG3pEee-2pFlIsT02Q" name="ro.ieat.dice.ADT_IDE"/>
+  <packagedElement xmi:type="uml:Component" xmi:id="_lN2iUG3pEee-2pFlIsT02Q" name="ro.ieat.dice.adt.feature"/>
   <packagedElement xmi:type="uml:Component" xmi:id="_sl7jIG3pEee-2pFlIsT02Q" name="org.dice.features.base"/>
 </uml:Model>
diff --git a/dice_papyrus_models/components.notation b/dice_papyrus_models/components.notation
@@ -352,7 +352,7 @@
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TijYpnEzEeeTB424yHWZ2g"/>
         </children>
         <element xmi:type="uml:Component" href="components.uml#_TihjcHEzEeeTB424yHWZ2g"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TijYqnEzEeeTB424yHWZ2g" x="1596" y="137"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TijYqnEzEeeTB424yHWZ2g" x="947" y="239"/>
       </children>
       <children xmi:type="notation:Shape" xmi:id="_5rFqUHIBEeeTB424yHWZ2g" type="Component_PackagedElementShape_CCN" fillColor="8047085">
         <children xmi:type="notation:DecorationNode" xmi:id="_5rFqUXIBEeeTB424yHWZ2g" type="Component_NameLabel_CCN"/>
@@ -364,7 +364,19 @@
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5rFqVnIBEeeTB424yHWZ2g"/>
         </children>
         <element xmi:type="uml:Component" href="components.uml#_5rBY4HIBEeeTB424yHWZ2g"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5rFqWnIBEeeTB424yHWZ2g" x="1854" y="135"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5rFqWnIBEeeTB424yHWZ2g" x="1210" y="242"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_H2wZYHKzEeeTB424yHWZ2g" type="Component_PackagedElementShape_CCN" fillColor="8047085">
+        <children xmi:type="notation:DecorationNode" xmi:id="_H2wZYXKzEeeTB424yHWZ2g" type="Component_NameLabel_CCN"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_H2wZYnKzEeeTB424yHWZ2g" type="Component_FloatingNameLabel_CCN">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_H2wZY3KzEeeTB424yHWZ2g" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_H2wZZHKzEeeTB424yHWZ2g" type="Component_StructureCompartment_CCN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_H2wZZXKzEeeTB424yHWZ2g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2wZZnKzEeeTB424yHWZ2g"/>
+        </children>
+        <element xmi:type="uml:Component" href="components.uml#_H2tWEHKzEeeTB424yHWZ2g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H2wZanKzEeeTB424yHWZ2g" x="1381" y="243"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_QDifEeBWEeWNL_YKB8_3iw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QDifEuBWEeWNL_YKB8_3iw"/>
@@ -374,7 +386,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9p9T8rIwEeauNfMY7ucCOQ"/>
     </children>
     <element xmi:type="uml:Component" href="components.uml#_QCVlMOBWEeWNL_YKB8_3iw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QDOWAeBWEeWNL_YKB8_3iw" x="110" y="110" width="2032" height="883"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QDOWAeBWEeWNL_YKB8_3iw" x="110" y="110" width="1663" height="883"/>
   </children>
   <styles xmi:type="notation:StringValueStyle" xmi:id="__KdpIeBVEeW-1LDt9RpxOw" name="diagram_compatibility_version" stringValue="1.2.0"/>
   <styles xmi:type="notation:DiagramStyle" xmi:id="__KdpIuBVEeW-1LDt9RpxOw"/>
@@ -899,8 +911,8 @@
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_bx4xkXEzEeeTB424yHWZ2g"/>
     <element xmi:type="uml:Dependency" href="components.uml#_bxJxwHEzEeeTB424yHWZ2g"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bx4xknEzEeeTB424yHWZ2g" points="[1827, 298, -643984, -643984]$[1827, 269, -643984, -643984]$[939, 269, -643984, -643984]$[939, 241, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bzR4sHEzEeeTB424yHWZ2g" id="(0.46963562753036436,0.0)"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bx4xknEzEeeTB424yHWZ2g" points="[1188, 400, -643984, -643984]$[1188, 269, -643984, -643984]$[939, 269, -643984, -643984]$[939, 241, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bzR4sHEzEeeTB424yHWZ2g" id="(0.5020242914979757,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bzSfwHEzEeeTB424yHWZ2g" id="(0.5,1.0)"/>
   </edges>
   <edges xmi:type="notation:Connector" xmi:id="_8LWAkHIBEeeTB424yHWZ2g" type="Dependency_Edge" source="_5rFqUHIBEeeTB424yHWZ2g" target="_eB2NAOBWEeWNL_YKB8_3iw" routing="Rectilinear">
@@ -918,4 +930,19 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8NBbkHIBEeeTB424yHWZ2g" id="(0.23376623376623376,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8NBbkXIBEeeTB424yHWZ2g" id="(0.5,1.0)"/>
   </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Kv5JsHKzEeeTB424yHWZ2g" type="Dependency_Edge" source="_H2wZYHKzEeeTB424yHWZ2g" target="_eB2NAOBWEeWNL_YKB8_3iw" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Kv5wwHKzEeeTB424yHWZ2g" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MXpxsHKzEeeTB424yHWZ2g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Kv5wwXKzEeeTB424yHWZ2g" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Kv5wwnKzEeeTB424yHWZ2g" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_MYuIsHKzEeeTB424yHWZ2g" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Kv5ww3KzEeeTB424yHWZ2g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Kv5JsXKzEeeTB424yHWZ2g"/>
+    <element xmi:type="uml:Dependency" href="components.uml#_H2tWEXKzEeeTB424yHWZ2g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kv5JsnKzEeeTB424yHWZ2g" points="[1541, 404, -643984, -643984]$[1541, 268, -643984, -643984]$[939, 268, -643984, -643984]$[939, 241, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KyejoHKzEeeTB424yHWZ2g" id="(0.2391304347826087,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KyejoXKzEeeTB424yHWZ2g" id="(0.5,1.0)"/>
+  </edges>
 </notation:Diagram>
diff --git a/dice_papyrus_models/components.uml b/dice_papyrus_models/components.uml
@@ -96,5 +96,8 @@
     <packagedElement xmi:type="uml:Component" xmi:id="_5rBY4HIBEeeTB424yHWZ2g" name="Quality Testing 1.0.0">
       <packagedElement xmi:type="uml:Dependency" xmi:id="_5rBY4XIBEeeTB424yHWZ2g" client="_5rBY4HIBEeeTB424yHWZ2g" supplier="_eBirAOBWEeWNL_YKB8_3iw"/>
     </packagedElement>
+    <packagedElement xmi:type="uml:Component" xmi:id="_H2tWEHKzEeeTB424yHWZ2g" name="Anomaly Detection 1.0.0">
+      <packagedElement xmi:type="uml:Dependency" xmi:id="_H2tWEXKzEeeTB424yHWZ2g" client="_H2tWEHKzEeeTB424yHWZ2g" supplier="_eBirAOBWEeWNL_YKB8_3iw"/>
+    </packagedElement>
   </packagedElement>
 </uml:Model>
diff --git a/dice_papyrus_models/deployments.notation b/dice_papyrus_models/deployments.notation
@@ -10,19 +10,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cMDVJ7rIEeaEY8PkEXRd3w"/>
     </children>
     <element xmi:type="uml:Component" href="deployments.uml#_cMDVELrIEeaEY8PkEXRd3w"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cMDVK7rIEeaEY8PkEXRd3w" x="457" y="202"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_lN3JYG3pEee-2pFlIsT02Q" type="Component_PackagedElementShape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_lN3JYW3pEee-2pFlIsT02Q" type="Component_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_lN3JYm3pEee-2pFlIsT02Q" type="Component_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lN3JY23pEee-2pFlIsT02Q" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_lN3JZG3pEee-2pFlIsT02Q" type="Component_StructureCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_lN3JZW3pEee-2pFlIsT02Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lN3JZm3pEee-2pFlIsT02Q"/>
-    </children>
-    <element xmi:type="uml:Component" href="deployments.uml#_lN2iUG3pEee-2pFlIsT02Q"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lN3Jam3pEee-2pFlIsT02Q" x="71" y="58"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cMDVK7rIEeaEY8PkEXRd3w" x="457" y="246"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_m5oHoG3pEee-2pFlIsT02Q" type="Component_PackagedElementShape">
     <children xmi:type="notation:DecorationNode" xmi:id="_m5oHoW3pEee-2pFlIsT02Q" type="Component_NameLabel"/>
@@ -70,37 +58,22 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sl7jJ23pEee-2pFlIsT02Q"/>
     </children>
     <element xmi:type="uml:Component" href="deployments.uml#_sl7jIG3pEee-2pFlIsT02Q"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sl7jK23pEee-2pFlIsT02Q" x="765" y="203"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sl7jK23pEee-2pFlIsT02Q" x="765" y="247"/>
   </children>
   <styles xmi:type="notation:StringValueStyle" xmi:id="_btph0rrIEeaEY8PkEXRd3w" name="diagram_compatibility_version" stringValue="1.2.0"/>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_btph07rIEeaEY8PkEXRd3w"/>
   <styles xmi:type="style:PapyrusViewStyle" xmi:id="_btph1LrIEeaEY8PkEXRd3w">
     <owner xmi:type="uml:Model" href="deployments.uml#_btph0LrIEeaEY8PkEXRd3w"/>
   </styles>
   <element xmi:type="uml:Model" href="deployments.uml#_btph0LrIEeaEY8PkEXRd3w"/>
-  <edges xmi:type="notation:Connector" xmi:id="_xtn1sG3pEee-2pFlIsT02Q" type="Dependency_Edge" source="_cMDVIbrIEeaEY8PkEXRd3w" target="_lN3JYG3pEee-2pFlIsT02Q" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_xtn1s23pEee-2pFlIsT02Q" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1u0aQG3pEee-2pFlIsT02Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xtn1tG3pEee-2pFlIsT02Q" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xtocwG3pEee-2pFlIsT02Q" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_1u-LQG3pEee-2pFlIsT02Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xtocwW3pEee-2pFlIsT02Q" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xtn1sW3pEee-2pFlIsT02Q"/>
-    <element xmi:type="uml:Dependency" href="deployments.uml#_xtddoG3pEee-2pFlIsT02Q"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xtn1sm3pEee-2pFlIsT02Q" points="[457, 235, -643984, -643984]$[391, 235, -643984, -643984]$[391, 92, -643984, -643984]$[250, 92, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xuFIsG3pEee-2pFlIsT02Q" id="(0.0,0.4857142857142857)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xuFIsW3pEee-2pFlIsT02Q" id="(1.0,0.4857142857142857)"/>
-  </edges>
   <edges xmi:type="notation:Connector" xmi:id="_yBWqAG3pEee-2pFlIsT02Q" type="Dependency_Edge" source="_cMDVIbrIEeaEY8PkEXRd3w" target="_m_pQEW3pEee-2pFlIsT02Q" routing="Rectilinear">
     <children xmi:type="notation:DecorationNode" xmi:id="_yBWqA23pEee-2pFlIsT02Q" type="Dependency_NameLabel">
       <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4jQ30G3pEee-2pFlIsT02Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
       <layoutConstraint xmi:type="notation:Location" xmi:id="_yBWqBG3pEee-2pFlIsT02Q" y="40"/>
     </children>
     <children xmi:type="notation:DecorationNode" xmi:id="_yBWqBW3pEee-2pFlIsT02Q" type="Dependency_StereotypeLabel">
       <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4jYzoG3pEee-2pFlIsT02Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yBWqBm3pEee-2pFlIsT02Q" y="60"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_yBWqBm3pEee-2pFlIsT02Q" x="-44" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_yBWqAW3pEee-2pFlIsT02Q"/>
     <element xmi:type="uml:Dependency" href="deployments.uml#_yA-2kG3pEee-2pFlIsT02Q"/>
@@ -140,14 +113,16 @@
   </edges>
   <edges xmi:type="notation:Connector" xmi:id="_y2BoMG3pEee-2pFlIsT02Q" type="Dependency_Edge" source="_cMDVIbrIEeaEY8PkEXRd3w" target="_sl7jIW3pEee-2pFlIsT02Q" routing="Rectilinear">
     <children xmi:type="notation:DecorationNode" xmi:id="_y2BoM23pEee-2pFlIsT02Q" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aOCyYHK2EeeTB424yHWZ2g" name="IS_UPDATED_POSITION" booleanValue="true"/>
       <layoutConstraint xmi:type="notation:Location" xmi:id="_y2BoNG3pEee-2pFlIsT02Q" y="40"/>
     </children>
     <children xmi:type="notation:DecorationNode" xmi:id="_y2BoNW3pEee-2pFlIsT02Q" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aOIR8HK2EeeTB424yHWZ2g" name="IS_UPDATED_POSITION" booleanValue="true"/>
       <layoutConstraint xmi:type="notation:Location" xmi:id="_y2BoNm3pEee-2pFlIsT02Q" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_y2BoMW3pEee-2pFlIsT02Q"/>
     <element xmi:type="uml:Dependency" href="deployments.uml#_y12pEG3pEee-2pFlIsT02Q"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y2BoMm3pEee-2pFlIsT02Q" points="[678, 236, -643984, -643984]$[765, 236, -643984, -643984]"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y2BoMm3pEee-2pFlIsT02Q" points="[678, 280, -643984, -643984]$[765, 280, -643984, -643984]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y2e7MG3pEee-2pFlIsT02Q" id="(1.0,0.4857142857142857)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y2e7MW3pEee-2pFlIsT02Q" id="(0.0,0.4714285714285714)"/>
   </edges>

diff --git a/dice_papyrus_models/deployments.uml b/dice_papyrus_models/deployments.uml
@@ -49,13 +49,11 @@
     <packagedElement xmi:type="uml:Dependency" xmi:id="_cMDVILrIEeaEY8PkEXRd3w" client="_cMDVELrIEeaEY8PkEXRd3w">
       <supplier xmi:type="uml:Component" href="monitoring.uml#_oN39sbrHEeaEY8PkEXRd3w"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Dependency" xmi:id="_xtddoG3pEee-2pFlIsT02Q" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_lN2iUG3pEee-2pFlIsT02Q"/>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_yA-2kG3pEee-2pFlIsT02Q" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_m_pQEG3pEee-2pFlIsT02Q"/>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_yRAPkG3pEee-2pFlIsT02Q" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_nHs_4G3pEee-2pFlIsT02Q"/>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_ylOMEG3pEee-2pFlIsT02Q" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_m5ngkG3pEee-2pFlIsT02Q"/>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_y12pEG3pEee-2pFlIsT02Q" client="_cMDVELrIEeaEY8PkEXRd3w" supplier="_sl7jIG3pEee-2pFlIsT02Q"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Component" xmi:id="_lN2iUG3pEee-2pFlIsT02Q" name="org.dice.compat.feature"/>
   <packagedElement xmi:type="uml:Component" xmi:id="_m5ngkG3pEee-2pFlIsT02Q" name="org.dice.deployments.ui.feature"/>
   <packagedElement xmi:type="uml:Component" xmi:id="_m_pQEG3pEee-2pFlIsT02Q" name="org.dice.deployments.client.feature"/>
   <packagedElement xmi:type="uml:Component" xmi:id="_nHs_4G3pEee-2pFlIsT02Q" name="org.dice.deployments.datastore.feature"/>

diff --git a/org.dice.root/features/org.dice.features.deployments/feature.xml b/org.dice.root/features/org.dice.features.deployments/feature.xml
@@ -217,7 +217,6 @@ litigation
       <import feature="org.dice.deployments.client.feature" version="0.3.0.201704131952"/>
       <import feature="org.dice.deployments.datastore.feature" version="0.3.0.201704131952"/>
       <import feature="org.dice.deployments.ui.feature" version="0.3.0.201704131952"/>
-      <import feature="org.dice.compat.feature" version="0.1.0.201704131952"/>
    </requires>
 
 </feature>