Fix profile definition to solve a problem when editing DAM complex

datatypes and publish v0.2.0
dice-project · Oct 8, 2015 · 25c474d · 25c474d
1 parent 7e2ace0
commit 25c474d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 9 deletions.
diff --git a/com.masdes.dam.profile.feature/feature.xml b/com.masdes.dam.profile.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.masdes.dam.profile"
       label="DICE DAM Profile"
-      version="0.1.0.qualifier"
+      version="0.2.0.qualifier"
       provider-name="DisCo - Unizar">
 
    <description url="https://github.com/dice-project/DICE-Profiles">

diff --git a/com.masdes.dam.static.profile/plugin.xml b/com.masdes.dam.static.profile/plugin.xml
@@ -99,8 +99,21 @@
             uri="http://com.masdes.dam/profiles/Maintenance/1.0">
       </profile>
       <profile
+            location="pathmap://DAM_PROFILES/DAM.profile.uml#_dYZGQOI-EeKRk-i8_Z91aQ"
             uri="http://com.masdes.dam/profiles/DAM/1.0">
       </profile>
+      <profile
+            location="pathmap://DAM_LIBRARIES/DAM_Library.uml#_-D83AOO-EeKfhZ42b6AKfg"
+            uri="http://com.masdes.dam/libraries/DAM/Complex_Data_Types/1.0">
+      </profile>
+      <profile
+            location="pathmap://DAM_LIBRARIES/DAM_Library.uml#_u647gOMhEeKpXO-aU5uALA"
+            uri="http://com.masdes.dam/libraries/DAM/Basic_Enumeration_Types/1.0">
+      </profile>
+      <profile
+            location="pathmap://DAM_LIBRARIES/DAM_Library.uml#_OOOL0OMzEeK2x-cjwHbYGg"
+            uri="http://com.masdes.dam/libraries/DAM/Basic_Data_Types/1.0">
+      </profile>
    </extension>
    <extension
          point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

diff --git a/com.masdes.dam.static.profile/resources/DAM.profile.notation b/com.masdes.dam.static.profile/resources/DAM.profile.notation
@@ -334,7 +334,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwaO9OPxEeKfvsJiOXhpew"/>
       </children>
       <element xmi:type="uml:Stereotype" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_XYaMIBKYEdyGYuetzx6T5A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwYZwePxEeKfvsJiOXhpew" y="60" width="277"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BwYZwePxEeKfvsJiOXhpew" y="68" width="277"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_PithMOPxEeKfvsJiOXhpew" type="1026" fontName="Ubuntu" fontHeight="11" fillColor="8047085" gradient="16777215, 16777215, 0" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PiuIQOPxEeKfvsJiOXhpew" source="ShadowFigure">
@@ -730,8 +730,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_G_qiEePxEeKfvsJiOXhpew" fontName="Ubuntu" fontHeight="11"/>
       <element xmi:type="uml:Generalization" href="DAM.profile.uml#_G_j0YOPxEeKfvsJiOXhpew"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G_qiEuPxEeKfvsJiOXhpew" points="[2, -4, 0, 74]$[1, -60, -1, 18]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G_uMcOPxEeKfvsJiOXhpew" id="(0.49097472924187724,0.013114754098360656)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G_uMcePxEeKfvsJiOXhpew" id="(0.4981949458483754,0.82)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G_uMcOPxEeKfvsJiOXhpew" id="(0.46851385390428213,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G_uMcePxEeKfvsJiOXhpew" id="(0.4981949458483754,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_vsp5IOPxEeKfvsJiOXhpew" type="4002" source="_PithMOPxEeKfvsJiOXhpew" target="_SdZwsOPxEeKfvsJiOXhpew" routing="Rectilinear" closestDistance="true" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="_vsp5I-PxEeKfvsJiOXhpew" type="6007">

diff --git a/com.masdes.dam.static.profile/resources/DAM_Library.uml b/com.masdes.dam.static.profile/resources/DAM_Library.uml
@@ -2,8 +2,8 @@
 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Package xmi:id="_dYZGQOI-EeKRk-i8_Z91aQ" name="DAM_Library">
     <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_11GCMO1hEeK7tq1KLgdlqA" source="http://www.eclipse.org/uml2/2.0.0/UML"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_AA8ZMOJAEeKRk-i8_Z91aQ" name="Basic_DA_Types">
-      <packagedElement xmi:type="uml:Package" xmi:id="_u647gOMhEeKpXO-aU5uALA" name="Enumeration_Types">
+    <packagedElement xmi:type="uml:Profile" xmi:id="_AA8ZMOJAEeKRk-i8_Z91aQ" name="Basic_DA_Types">
+      <packagedElement xmi:type="uml:Profile" xmi:id="_u647gOMhEeKpXO-aU5uALA" name="Enumeration_Types">
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_fDERwOMiEeKpXO-aU5uALA" name="DaFrequencyUnitKind">
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kW6xAOMiEeKpXO-aU5uALA" name="ft_s"/>
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_aveqwOMkEeKpXO-aU5uALA" name="ft_ms"/>
@@ -141,7 +141,7 @@
           <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_4AS04Oo0EeKc9NXl55bCKA" name="incompetence"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_OOOL0OMzEeK2x-cjwHbYGg" name="Data_Types">
+      <packagedElement xmi:type="uml:Profile" xmi:id="_OOOL0OMzEeK2x-cjwHbYGg" name="Data_Types">
         <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_n06SIOMzEeK2x-cjwHbYGg" name="DaFrequency">
           <generalization xmi:type="uml:Generalization" xmi:id="_2DsXoGuCEeWuyN14ri69MA">
             <general xmi:type="uml:DataType" href="pathmap://Papyrus_LIBRARIES/MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
@@ -212,8 +212,8 @@
         </packagedElement>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_ux5PAOMKEeKpXO-aU5uALA" name="Complex_DA_Types">
-      <packagedElement xmi:type="uml:Package" xmi:id="_-D83AOO-EeKfhZ42b6AKfg" name="Data_Types">
+    <packagedElement xmi:type="uml:Profile" xmi:id="_ux5PAOMKEeKpXO-aU5uALA" name="Complex_DA_Types">
+      <packagedElement xmi:type="uml:Profile" xmi:id="_-D83AOO-EeKfhZ42b6AKfg" name="Data_Types">
         <packagedElement xmi:type="uml:DataType" xmi:id="_UQBQkOO_EeKfhZ42b6AKfg" name="DaError">
           <ownedAttribute xmi:type="uml:Property" xmi:id="_lRzWkOO_EeKfhZ42b6AKfg" name="latency" visibility="public">
             <type xmi:type="uml:DataType" href="pathmap://Papyrus_LIBRARIES/MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>

diff --git a/io.github.dice-project.profiles.updatesite/artifacts.jar b/io.github.dice-project.profiles.updatesite/artifacts.jar
diff --git a/io.github.dice-project.profiles.updatesite/content.jar b/io.github.dice-project.profiles.updatesite/content.jar
diff --git a/...b.dice-project.profiles.updatesite/features/com.masdes.dam.profile_0.2.0.201510081804.jar b/...b.dice-project.profiles.updatesite/features/com.masdes.dam.profile_0.2.0.201510081804.jar
diff --git a/...-project.profiles.updatesite/plugins/com.masdes.dam.static.profile_0.1.0.201510081804.jar b/...-project.profiles.updatesite/plugins/com.masdes.dam.static.profile_0.1.0.201510081804.jar
diff --git a/io.github.dice-project.profiles.updatesite/site.xml b/io.github.dice-project.profiles.updatesite/site.xml
@@ -6,6 +6,9 @@
    <feature url="features/com.masdes.dam.profile_0.1.0.201510081501.jar" id="com.masdes.dam.profile" version="0.1.0.201510081501">
       <category name="DICE Profiles"/>
    </feature>
+   <feature url="features/com.masdes.dam.profile_0.2.0.201510081804.jar" id="com.masdes.dam.profile" version="0.2.0.201510081804">
+      <category name="DICE Profiles"/>
+   </feature>
    <category-def name="DICE Profiles" label="DICE Profiles">
       <description>
          Profiles for the DICE Project