[MARTE] bug fix - https://bugs.eclipse.org/bugs/show_bug.cgi?id=374383

18 files changed, 554 insertions, 72 deletions

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.xml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.xml
index 103d5a2f181..75ecc4b2a90 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.xml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.xml
@@ -46,6 +46,22 @@
             uri="http://www.eclipse.org/papyrus/NFPs/1">

       </package>

    </extension>

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/MARTE/1"

+            class="org.eclipse.papyrus.MARTE.MARTEPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/NFPs/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

    <extension

          point="org.eclipse.emf.ecore.extension_parser">

       <parser

@@ -53,6 +69,81 @@
             type="MARTE">

       </parser>

    </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/CoreElements/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="coreelements"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.util.CoreElementsResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/Alloc/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="alloc"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.util.AllocResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/Time/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="time"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util.TimeResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/GRM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="grm"

+            class="org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.util.GRMResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/RSM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="rsm"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.util.RSMResourceFactoryImpl"/>

+   </extension>

    <extension

          point="org.eclipse.uml2.uml.generated_package">

       <profile

@@ -946,6 +1037,311 @@
             uri="http://www.eclipse.org/papyrus/HwStorage/1">

       </package>

    </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwStorageManager/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwstoragemanager"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.util.HwStorageManagerResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwMemory/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwmemory"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.util.HwMemoryResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwTiming/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwtiming"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.util.HwTimingResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwDevice/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwdevice"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.util.HwDeviceResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwGeneral/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwgeneral"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.util.HwGeneralResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwPhysical/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPhysicalPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwLayout/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwlayout"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.util.HwLayoutResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwPower/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwpower"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.util.HwPowerResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/SRM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SRMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/SW_ResourceCore/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="sw_resourcecore"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.util.SW_ResourceCoreResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/SW_Concurrency/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="sw_concurrency"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.util.SW_ConcurrencyResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/SW_Brokering/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="sw_brokering"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.util.SW_BrokeringResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/SW_Interaction/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="sw_interaction"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.util.SW_InteractionResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/GCM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="gcm"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.util.GCMResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/GQAM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="gqam"

+            class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.util.GQAMResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/SAM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="sam"

+            class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.util.SAMResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/PAM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="pam"

+            class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.util.PAMResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/MeasurementUnits.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/GRM_BasicTypes.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/MARTE_DataTypes.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/BasicNFP_Types.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/TimeTypesLibrary.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/TimeLibrary.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/RS_Library.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http:///MARTE_Library/MARTE_PrimitivesTypes.ecore"

+            class="org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

    <extension

          point="org.eclipse.emf.ecore.generated_package">

       <package

@@ -980,4 +1376,110 @@
       </package>

    </extension>

 

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/Variables/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="variables"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.util.VariablesResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/Operators/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="operators"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.util.OperatorsResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/DataTypes/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="datatypes"

+            class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.util.DataTypesResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HLAM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hlam"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.util.HLAMResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HRM/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HRMPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwLogical/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwLogicalPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwComputing/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwcomputing"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.util.HwComputingResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated MARTE -->

+      <package

+            uri="http://www.eclipse.org/papyrus/HwCommunication/1"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage"

+            genModel="resources/MARTE.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated MARTE -->

+      <parser

+            type="hwcommunication"

+            class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.util.HwCommunicationResourceFactoryImpl"/>

+   </extension>

+

 </plugin>

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore
index 95a4a82f7cf..e7b6a924bfc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore
@@ -963,8 +963,7 @@
           <eStructuralFeatures xsi:type="ecore:EReference" name="r_HW_Services" ordered="false"

               upperBound="-1" eType="#//MARTE_DesignModel/HRM/HwGeneral/HwResourceService"/>

           <eStructuralFeatures xsi:type="ecore:EReference" name="ownedHW" ordered="false"

-              upperBound="-1" eType="#//MARTE_DesignModel/HRM/HwGeneral/HwResource"

-              containment="true"/>

+              upperBound="-1" eType="#//MARTE_DesignModel/HRM/HwGeneral/HwResource"/>

           <eStructuralFeatures xsi:type="ecore:EReference" name="endPoints" ordered="false"

               upperBound="-1" eType="#//MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwEndPoint">

             <eAnnotations source="subsets" references="#//MARTE_DesignModel/HRM/HwGeneral/HwResource/ownedHW"/>

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
index 766fd96cc6f..9fb35418656 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
@@ -2787,7 +2787,7 @@
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_olkHcWucEeKh2rhLHsYgWg"/>

               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_olkHcmucEeKh2rhLHsYgWg" value="*"/>

             </ownedAttribute>

-            <ownedAttribute xmi:id="_WnHIYGudEeKh2rhLHsYgWg" name="ownedHW" type="_LDER0BJxEdygQ5HMNSpiZw" aggregation="composite" association="_WnHIY2udEeKh2rhLHsYgWg">

+            <ownedAttribute xmi:id="_WnHIYGudEeKh2rhLHsYgWg" name="ownedHW" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WnHIY2udEeKh2rhLHsYgWg">

               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WnHIYWudEeKh2rhLHsYgWg"/>

               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WnHIYmudEeKh2rhLHsYgWg" value="*"/>

             </ownedAttribute>

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.ecore b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.ecore
index 83cfd819f9c..6a8606ec1ee 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.ecore
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.ecore
@@ -1,8 +1,6 @@
 <?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="MARTE_Library"

-    nsURI="http:///MARTE_Library.ecore" nsPrefix="MARTE_Library">

+<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="MARTE_Library" nsURI="http:///MARTE_Library.ecore" nsPrefix="MARTE_Library">

   <eSubpackages name="MeasurementUnits" nsURI="http:///MARTE_Library/MeasurementUnits.ecore"

       nsPrefix="MARTE_Library.MeasurementUnits">

     <eClassifiers xsi:type="ecore:EEnum" name="TimeUnitKind">

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml
index 5ebcd1fc77a..937b5966e68 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:DataTypes="http://www.eclipse.org/papyrus/DataTypes/1" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:NFPs="http://www.eclipse.org/papyrus/NFPs/1" xmlns:Time="http://www.eclipse.org/papyrus/Time/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/DataTypes/1 http://www.eclipse.org/papyrus/MARTE/1#//DataTypes http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://www.eclipse.org/papyrus/NFPs/1 http://www.eclipse.org/papyrus/MARTE/1#//NFPs http://www.eclipse.org/papyrus/Time/1 http://www.eclipse.org/papyrus/MARTE/1#//Time">

+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:DataTypes="http://www.eclipse.org/papyrus/DataTypes/1" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:NFPs="http://www.eclipse.org/papyrus/NFPs/1" xmlns:Time="http://www.eclipse.org/papyrus/Time/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/DataTypes/1 http://www.eclipse.org/papyrus/MARTE/1#//VSL/DataTypes http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://www.eclipse.org/papyrus/NFPs/1 http://www.eclipse.org/papyrus/MARTE/1#//NFPs http://www.eclipse.org/papyrus/Time/1 http://www.eclipse.org/papyrus/MARTE/1#//Time">

   <uml:Package xmi:id="_uBlQkA73EdyML4mHwjNDrw" name="MARTE_Library">

     <packageImport xmi:id="_uBlQkQ73EdyML4mHwjNDrw">

       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

@@ -2333,24 +2333,11 @@
   <l2:ModelLibrary xmi:id="_50PZULGzEd-tmN4hwNCxXQ" base_Package="_x9l9sA74EdyML4mHwjNDrw"/>

   <l2:ModelLibrary xmi:id="_DcPoAG6oEeKwEYt6tp1Aqg" base_Package="_uBlQkA73EdyML4mHwjNDrw"/>

   <NFPs:Dimension xmi:id="_gVWNIHHQEeKqG9oh8v31vA" symbol="T" base_Enumeration="_Iaa3gA4yEdysTsAUPnp57Q"/>

-  <NFPs:Dimension xmi:id="_jY-9QHHQEeKqG9oh8v31vA" symbol="" baseDimension="_37FIUHHQEeKqG9oh8v31vA _5PvOIHHQEeKqG9oh8v31vA _gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_ijhHUA4yEdysTsAUPnp57Q">

-    <!--baseExponent>2</baseExponent>

-    <baseExponent>1</baseExponent>

-    <baseExponent>-3</baseExponent-->

-  </NFPs:Dimension>

-  <NFPs:Dimension xmi:id="_l4wyYHHQEeKqG9oh8v31vA" symbol="" baseDimension="_gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_qFaygA4yEdysTsAUPnp57Q">

-    <!--baseExponent>-1</baseExponent-->

-  </NFPs:Dimension>

+  <NFPs:Dimension xmi:id="_jY-9QHHQEeKqG9oh8v31vA" symbol="" baseDimension="_37FIUHHQEeKqG9oh8v31vA _5PvOIHHQEeKqG9oh8v31vA _gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_ijhHUA4yEdysTsAUPnp57Q"/>

+  <NFPs:Dimension xmi:id="_l4wyYHHQEeKqG9oh8v31vA" symbol="" baseDimension="_gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_qFaygA4yEdysTsAUPnp57Q"/>

   <NFPs:Dimension xmi:id="_wk92YHHQEeKqG9oh8v31vA" symbol="D" base_Enumeration="_2pVmEA4yEdysTsAUPnp57Q"/>

-  <NFPs:Dimension xmi:id="_2itnMHHQEeKqG9oh8v31vA" baseDimension="_wk92YHHQEeKqG9oh8v31vA _gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_DyNg0A4zEdysTsAUPnp57Q">

-    <!--baseExponent>1</baseExponent>

-    <baseExponent>-1</baseExponent-->

-  </NFPs:Dimension>

-  <NFPs:Dimension xmi:id="_3R3zQHHQEeKqG9oh8v31vA" baseDimension="_37FIUHHQEeKqG9oh8v31vA _5PvOIHHQEeKqG9oh8v31vA _gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_UaKKgA4zEdysTsAUPnp57Q">

-    <!--baseExponent>2</baseExponent>

-    <baseExponent>1</baseExponent>

-    <baseExponent>-2</baseExponent-->

-  </NFPs:Dimension>

+  <NFPs:Dimension xmi:id="_2itnMHHQEeKqG9oh8v31vA" baseDimension="_wk92YHHQEeKqG9oh8v31vA _gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_DyNg0A4zEdysTsAUPnp57Q"/>

+  <NFPs:Dimension xmi:id="_3R3zQHHQEeKqG9oh8v31vA" baseDimension="_37FIUHHQEeKqG9oh8v31vA _5PvOIHHQEeKqG9oh8v31vA _gVWNIHHQEeKqG9oh8v31vA" base_Enumeration="_UaKKgA4zEdysTsAUPnp57Q"/>

   <NFPs:Dimension xmi:id="_37FIUHHQEeKqG9oh8v31vA" symbol="L" base_Enumeration="_g5AQ0A4zEdysTsAUPnp57Q"/>

   <NFPs:Dimension xmi:id="_4jZskHHQEeKqG9oh8v31vA" base_Enumeration="_Sw5dsBFUEdyUJeMeN__D-A"/>

   <NFPs:Dimension xmi:id="_5PvOIHHQEeKqG9oh8v31vA" symbol="M" base_Enumeration="_fuoVADJSEd211cMdxu944g"/>

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java
index d57de5fd23f..17f97dde69e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java
@@ -268,7 +268,7 @@ public interface HwGeneralPackage extends EPackage {
 	int HW_RESOURCE__RHW_SERVICES = GRMPackage.RESOURCE_FEATURE_COUNT + 2;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -380,10 +380,10 @@ public interface HwGeneralPackage extends EPackage {
 	EReference getHwResource_R_HW_Services();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource#getOwnedHW <em>Owned HW</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource#getOwnedHW <em>Owned HW</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Owned HW</em>'.

+	 * @return the meta object for the reference list '<em>Owned HW</em>'.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource#getOwnedHW()

 	 * @see #getHwResource()

 	 * @generated

@@ -495,7 +495,7 @@ public interface HwGeneralPackage extends EPackage {
 		EReference HW_RESOURCE__RHW_SERVICES = eINSTANCE.getHwResource_R_HW_Services();

 

 		/**

-		 * The meta object literal for the '<em><b>Owned HW</b></em>' containment reference list feature.

+		 * The meta object literal for the '<em><b>Owned HW</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java
index 0a59c97eaad..dae82b05bc9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java
@@ -98,7 +98,7 @@ public interface HwResource extends Resource {
 	EList<HwResourceService> getR_HW_Services();

 

 	/**

-	 * Returns the value of the '<em><b>Owned HW</b></em>' containment reference list.

+	 * Returns the value of the '<em><b>Owned HW</b></em>' reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource}.

 	 * <!-- begin-user-doc -->

 	 * <p>

@@ -106,9 +106,9 @@ public interface HwResource extends Resource {
 	 * there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Owned HW</em>' containment reference list.

+	 * @return the value of the '<em>Owned HW</em>' reference list.

 	 * @see org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage#getHwResource_OwnedHW()

-	 * @model containment="true" ordered="false"

+	 * @model ordered="false"

 	 * @generated

 	 */

 	EList<HwResource> getOwnedHW();

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java
index fde7538c74a..693190625e9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java
@@ -493,7 +493,7 @@ public class HwGeneralPackageImpl extends EPackageImpl implements HwGeneralPacka
 		initEAttribute(getHwResource_Description(), theBasicNFP_TypesPackage.getNFP_String(), "description", null, 0, 1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getHwResource_P_HW_Services(), this.getHwResourceService(), null, "p_HW_Services", null, 0, -1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getHwResource_R_HW_Services(), this.getHwResourceService(), null, "r_HW_Services", null, 0, -1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getHwResource_OwnedHW(), this.getHwResource(), null, "ownedHW", null, 0, -1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEReference(getHwResource_OwnedHW(), this.getHwResource(), null, "ownedHW", null, 0, -1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEReference(getHwResource_EndPoints(), theHwCommunicationPackage.getHwEndPoint(), null, "endPoints", null, 0, -1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 		initEAttribute(getHwResource_Frequency(), theBasicNFP_TypesPackage.getNFP_Frequency(), "frequency", null, 0, 1, HwResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java
index 48c4700605b..38eada76161 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java
@@ -90,7 +90,7 @@ public class HwResourceImpl extends ResourceImpl implements HwResource {
 	protected EList<HwResourceService> r_HW_Services;

 

 	/**

-	 * The cached value of the '{@link #getOwnedHW() <em>Owned HW</em>}' containment reference list.

+	 * The cached value of the '{@link #getOwnedHW() <em>Owned HW</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @see #getOwnedHW()

@@ -200,7 +200,7 @@ public class HwResourceImpl extends ResourceImpl implements HwResource {
 	 */

 	public EList<HwResource> getOwnedHW() {

 		if (ownedHW == null) {

-			ownedHW = new EObjectContainmentEList<HwResource>(HwResource.class, this, HwGeneralPackage.HW_RESOURCE__OWNED_HW);

+			ownedHW = new EObjectResolvingEList<HwResource>(HwResource.class, this, HwGeneralPackage.HW_RESOURCE__OWNED_HW);

 		}

 		return ownedHW;

 	}

@@ -248,8 +248,6 @@ public class HwResourceImpl extends ResourceImpl implements HwResource {
 		switch (featureID) {

 			case HwGeneralPackage.HW_RESOURCE__PHW_SERVICES:

 				return ((InternalEList<?>)getP_HW_Services()).basicRemove(otherEnd, msgs);

-			case HwGeneralPackage.HW_RESOURCE__OWNED_HW:

-				return ((InternalEList<?>)getOwnedHW()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java
index 6d1d57091a0..e65a947803a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java
@@ -178,7 +178,7 @@ public interface HwCommunicationPackage extends EPackage {
 	int HW_COMMUNICATION_RESOURCE__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -323,7 +323,7 @@ public interface HwCommunicationPackage extends EPackage {
 	int HW_ARBITER__RHW_SERVICES = HW_COMMUNICATION_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -549,7 +549,7 @@ public interface HwCommunicationPackage extends EPackage {
 	int HW_MEDIA__RHW_SERVICES = GRMPackage.COMMUNICATION_MEDIA_FEATURE_COUNT + 2;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -784,7 +784,7 @@ public interface HwCommunicationPackage extends EPackage {
 	int HW_BUS__RHW_SERVICES = HW_MEDIA__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -1055,7 +1055,7 @@ public interface HwCommunicationPackage extends EPackage {
 	int HW_BRIDGE__RHW_SERVICES = HW_MEDIA__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -1227,7 +1227,7 @@ public interface HwCommunicationPackage extends EPackage {
 	int HW_END_POINT__RHW_SERVICES = HW_COMMUNICATION_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java
index 13a89d0aef0..f4985a9a0fb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java
@@ -97,7 +97,7 @@ public class HwMediaImpl extends CommunicationMediaImpl implements HwMedia {
 	protected EList<HwResourceService> r_HW_Services;

 

 	/**

-	 * The cached value of the '{@link #getOwnedHW() <em>Owned HW</em>}' containment reference list.

+	 * The cached value of the '{@link #getOwnedHW() <em>Owned HW</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @see #getOwnedHW()

@@ -237,7 +237,7 @@ public class HwMediaImpl extends CommunicationMediaImpl implements HwMedia {
 	 */

 	public EList<HwResource> getOwnedHW() {

 		if (ownedHW == null) {

-			ownedHW = new EObjectContainmentEList<HwResource>(HwResource.class, this, HwCommunicationPackage.HW_MEDIA__OWNED_HW);

+			ownedHW = new EObjectResolvingEList<HwResource>(HwResource.class, this, HwCommunicationPackage.HW_MEDIA__OWNED_HW);

 		}

 		return ownedHW;

 	}

@@ -333,8 +333,6 @@ public class HwMediaImpl extends CommunicationMediaImpl implements HwMedia {
 		switch (featureID) {

 			case HwCommunicationPackage.HW_MEDIA__PHW_SERVICES:

 				return ((InternalEList<?>)getP_HW_Services()).basicRemove(otherEnd, msgs);

-			case HwCommunicationPackage.HW_MEDIA__OWNED_HW:

-				return ((InternalEList<?>)getOwnedHW()).basicRemove(otherEnd, msgs);

 			case HwCommunicationPackage.HW_MEDIA__ARBITERS:

 				return ((InternalEList<?>)getArbiters()).basicRemove(otherEnd, msgs);

 		}

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java
index c1536749d11..c74e44c08f1 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java
@@ -179,7 +179,7 @@ public interface HwComputingPackage extends EPackage {
 	int HW_COMPUTING_RESOURCE__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -351,7 +351,7 @@ public interface HwComputingPackage extends EPackage {
 	int HW_PROCESSOR__RHW_SERVICES = HW_COMPUTING_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -631,7 +631,7 @@ public interface HwComputingPackage extends EPackage {
 	int HW_ISA__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -803,7 +803,7 @@ public interface HwComputingPackage extends EPackage {
 	int HW_BRANCH_PREDICTOR__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -948,7 +948,7 @@ public interface HwComputingPackage extends EPackage {
 	int HW_ASIC__RHW_SERVICES = HW_COMPUTING_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -1120,7 +1120,7 @@ public interface HwComputingPackage extends EPackage {
 	int HW_PLD__RHW_SERVICES = HW_COMPUTING_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java
index 29447c18bde..8acc53cfdbc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java
@@ -175,7 +175,7 @@ public interface HwDevicePackage extends EPackage {
 	int HW_DEVICE__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -338,7 +338,7 @@ public interface HwDevicePackage extends EPackage {
 	int HW_IO__RHW_SERVICES = HW_DEVICE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -501,7 +501,7 @@ public interface HwDevicePackage extends EPackage {
 	int HW_SUPPORT__RHW_SERVICES = HW_DEVICE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -664,7 +664,7 @@ public interface HwDevicePackage extends EPackage {
 	int HW_ACTUATOR__RHW_SERVICES = HW_IO__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -827,7 +827,7 @@ public interface HwDevicePackage extends EPackage {
 	int HW_SENSOR__RHW_SERVICES = HW_IO__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java
index 6ea900eeb9d..9d5b11152b3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java
@@ -179,7 +179,7 @@ public interface HwMemoryPackage extends EPackage {
 	int HW_MEMORY__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -369,7 +369,7 @@ public interface HwMemoryPackage extends EPackage {
 	int HW_RAM__RHW_SERVICES = HW_MEMORY__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -613,7 +613,7 @@ public interface HwMemoryPackage extends EPackage {
 	int HW_ROM__RHW_SERVICES = HW_MEMORY__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -821,7 +821,7 @@ public interface HwMemoryPackage extends EPackage {
 	int HW_DRIVE__RHW_SERVICES = HW_MEMORY__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -1029,7 +1029,7 @@ public interface HwMemoryPackage extends EPackage {
 	int HW_CACHE__RHW_SERVICES = HW_MEMORY__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java
index ed7c452b296..3c230eb271a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java
@@ -177,7 +177,7 @@ public interface HwStorageManagerPackage extends EPackage {
 	int HW_STORAGE_MANAGER__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -340,7 +340,7 @@ public interface HwStorageManagerPackage extends EPackage {
 	int HW_DMA__RHW_SERVICES = HW_STORAGE_MANAGER__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -539,7 +539,7 @@ public interface HwStorageManagerPackage extends EPackage {
 	int HW_MMU__RHW_SERVICES = HW_STORAGE_MANAGER__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java
index 11244e1f761..14c3cb9219d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java
@@ -177,7 +177,7 @@ public interface HwTimingPackage extends EPackage {
 	int HW_TIMING_RESOURCE__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -322,7 +322,7 @@ public interface HwTimingPackage extends EPackage {
 	int HW_CLOCK__RHW_SERVICES = HW_TIMING_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -467,7 +467,7 @@ public interface HwTimingPackage extends EPackage {
 	int HW_TIMER__RHW_SERVICES = HW_TIMING_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java
index b395949fde6..a535c9f2573 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java
@@ -179,7 +179,7 @@ public interface HwLayoutPackage extends EPackage {
 	int HW_COMPONENT__RHW_SERVICES = HwGeneralPackage.HW_RESOURCE__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java
index ce5b361fc62..4a6f56a467b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java
@@ -176,7 +176,7 @@ public interface HwPowerPackage extends EPackage {
 	int HW_POWER_SUPPLY__RHW_SERVICES = HwLayoutPackage.HW_COMPONENT__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -456,7 +456,7 @@ public interface HwPowerPackage extends EPackage {
 	int HW_COOLING_SUPPLY__RHW_SERVICES = HwLayoutPackage.HW_COMPONENT__RHW_SERVICES;

 

 	/**

-	 * The feature id for the '<em><b>Owned HW</b></em>' containment reference list.

+	 * The feature id for the '<em><b>Owned HW</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated