Update ESFCore profile and ESFArchitectureConcepts profile
1. ESFCore profile
- add AbstractSRequirement
- change multiplicity of the association between
AbstractSArchtectureelement and AbstractSafetyConcept
-rename properties
2. ESFArchitectureConcepts profile
- fix dependence with ESFCore profile
-rename properties
Change-Id: I485558e1318feedc848868823661038faf73efef
diff --git a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore
index 1af16b6..61d3fae 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore
+++ b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore
@@ -1,107 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- name="esfarchitectureconcepts" nsURI="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts"
- nsPrefix="ESFArchitectureConcepts">
- <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
- <details key="originalName" value="ESFArchitectureConcepts" />
- </eAnnotations>
- <eClassifiers xsi:type="ecore:EClass" name="SPort"
- eSuperTypes="#//AbstractSConnectableElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="rolesList" ordered="false" upperBound="-1" eType="#//SPortRole"
- eOpposite="#//SPortRole/type" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="owner" ordered="false" lowerBound="1" eType="#//SBlock"
- eOpposite="#//SBlock/ownedSPorts" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="base_Port" ordered="false" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port" />
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractSConnectableElement"
- abstract="true"
- eSuperTypes="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="sConnectorsList" ordered="false" upperBound="-1" eType="#//SConnector"
- eOpposite="#//SConnector/ends" />
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SConnector"
- eSuperTypes="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="base_Connector" ordered="false" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="owner" ordered="false" lowerBound="1" eType="#//SBlock"
- eOpposite="#//SBlock/sConnectorsList" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="ends" ordered="false" lowerBound="2" upperBound="-1"
- eType="#//AbstractSConnectableElement" eOpposite="#//AbstractSConnectableElement/sConnectorsList" />
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SBlock"
- eSuperTypes="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="base_Class" ordered="false" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class" />
- <eStructuralFeatures xsi:type="ecore:EAttribute"
- name="topBlock" ordered="false" lowerBound="1"
- eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"
- volatile="true" transient="true" defaultValueLiteral="false" derived="true" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="ownedSParts" ordered="false" upperBound="-1" eType="#//SPart"
- containment="true" eOpposite="#//SPart/owner" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="usages" ordered="false" upperBound="-1" eType="#//SPart"
- eOpposite="#//SPart/type" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="ownedSPortRoles" ordered="false" upperBound="-1" eType="#//SPortRole"
- containment="true" eOpposite="#//SPortRole/owner" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="ownedSPorts" ordered="false" upperBound="-1" eType="#//SPort"
- containment="true" eOpposite="#//SPort/owner" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="sModel" ordered="false" lowerBound="1" eType="#//SModel"
- eOpposite="#//SModel/onwedSBlocks" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="sConnectorsList" ordered="false" upperBound="-1" eType="#//SConnector"
- containment="true" eOpposite="#//SConnector/owner" />
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SPart"
- eSuperTypes="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="base_Property" ordered="false" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="type" ordered="false" lowerBound="1" eType="#//SBlock"
- eOpposite="#//SBlock/usages" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="sPortRolesList" ordered="false" upperBound="-1" eType="#//SPortRole"
- eOpposite="#//SPortRole/usageContext" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="owner" ordered="false" lowerBound="1" eType="#//SBlock"
- eOpposite="#//SBlock/ownedSParts" />
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SPortRole"
- eSuperTypes="#//AbstractSConnectableElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="base_Port" ordered="false" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="type" ordered="false" lowerBound="1" eType="#//SPort"
- eOpposite="#//SPort/rolesList" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="owner" ordered="false" lowerBound="1" eType="#//SBlock"
- eOpposite="#//SBlock/ownedSPortRoles" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="usageContext" ordered="false" lowerBound="1" eType="#//SPart"
- eOpposite="#//SPart/sPortRolesList" />
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SModel"
- eSuperTypes="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="base_Package" ordered="false" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package" />
- <eStructuralFeatures xsi:type="ecore:EReference"
- name="onwedSBlocks" ordered="false" upperBound="-1" eType="#//SBlock"
- containment="true" eOpposite="#//SBlock/sModel" />
- </eClassifiers>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="esfarchitectureconcepts" nsURI="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts"
+ nsPrefix="ESFArchitectureConcepts">
+ <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <details key="originalName" value="ESFArchitectureConcepts"/>
+ </eAnnotations>
+ <eClassifiers xsi:type="ecore:EClass" name="SPort" eSuperTypes="#//AbstractSConnectableElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rolesList" ordered="false"
+ upperBound="-1" eType="#//SPortRole" eOpposite="#//SPortRole/type"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false"
+ lowerBound="1" eType="#//SBlock" eOpposite="#//SBlock/ownedSPortsList"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" ordered="false"
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractSConnectableElement" abstract="true"
+ eSuperTypes="../../../../../../org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sConnectorsList" ordered="false"
+ upperBound="-1" eType="#//SConnector" eOpposite="#//SConnector/endsList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SConnector" eSuperTypes="../../../../../../org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_Connector" ordered="false"
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false"
+ lowerBound="1" eType="#//SBlock" eOpposite="#//SBlock/sConnectorsList"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="endsList" ordered="false"
+ lowerBound="2" upperBound="-1" eType="#//AbstractSConnectableElement" eOpposite="#//AbstractSConnectableElement/sConnectorsList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SBlock" eSuperTypes="../../../../../../org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="topBlock" ordered="false"
+ lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"
+ volatile="true" transient="true" defaultValueLiteral="false" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ownedSPartsList" ordered="false"
+ upperBound="-1" eType="#//SPart" containment="true" eOpposite="#//SPart/owner"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesList" ordered="false"
+ upperBound="-1" eType="#//SPart" eOpposite="#//SPart/type"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ownedSPortRolesList" ordered="false"
+ upperBound="-1" eType="#//SPortRole" containment="true" eOpposite="#//SPortRole/owner"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ownedSPortsList" ordered="false"
+ upperBound="-1" eType="#//SPort" containment="true" eOpposite="#//SPort/owner"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sModel" ordered="false"
+ lowerBound="1" eType="#//SModel" eOpposite="#//SModel/onwedSBlocksList"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sConnectorsList" ordered="false"
+ upperBound="-1" eType="#//SConnector" containment="true" eOpposite="#//SConnector/owner"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SPart" eSuperTypes="../../../../../../org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
+ eType="#//SBlock" eOpposite="#//SBlock/usagesList"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sPortRolesList" ordered="false"
+ upperBound="-1" eType="#//SPortRole" eOpposite="#//SPortRole/usageContext"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false"
+ lowerBound="1" eType="#//SBlock" eOpposite="#//SBlock/ownedSPartsList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SPortRole" eSuperTypes="#//AbstractSConnectableElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" ordered="false"
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
+ eType="#//SPort" eOpposite="#//SPort/rolesList"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false"
+ lowerBound="1" eType="#//SBlock" eOpposite="#//SBlock/ownedSPortRolesList"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="usageContext" ordered="false"
+ lowerBound="1" eType="#//SPart" eOpposite="#//SPart/sPortRolesList"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SModel" eSuperTypes="../../../../../../org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore#//AbstractSArchitectureElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" ordered="false"
+ lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="onwedSBlocksList" ordered="false"
+ upperBound="-1" eType="#//SBlock" containment="true" eOpposite="#//SBlock/sModel"/>
+ </eClassifiers>
</ecore:EPackage>