Commit 1afc3ff4 authored by Martti Käärik's avatar Martti Käärik
Browse files

Updated meta-model to v1.4.0 (unpublished stable). 

Change-Id: I3622c673c922a120b87d9f765d0e40115565fc36
parent 5d88888b

plugins/org.etsi.mts.tdl.model/META-INF/MANIFEST.MF

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ Manifest-Version: 1.0 
Bundle-ManifestVersion: 2

Bundle-ManifestVersion: 2

Bundle-Name: %pluginName

Bundle-Name: %pluginName

Bundle-SymbolicName: org.etsi.mts.tdl.model;singleton:=true

Bundle-SymbolicName: org.etsi.mts.tdl.model;singleton:=true

Bundle-Version: 1.3.1.qualifier

Bundle-Version: 1.4.0.qualifier

Bundle-ClassPath: .

Bundle-ClassPath: .

Bundle-Vendor: %providerName

Bundle-Vendor: %providerName

Bundle-Localization: plugin

Bundle-Localization: plugin

plugins/org.etsi.mts.tdl.model/model/tdl.ecore

+245 −130

File changed.

Preview size limit exceeded, changes collapsed.

plugins/org.etsi.mts.tdl.model/model/tdl.genmodel

+26 −2
Original line number Original line Diff line number Diff line
@@ -122,6 +122,11 @@ 
      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValue"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValue"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValueOrOmit"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//UnassignedMemberTreatment/AnyValueOrOmit"/>

    </genEnums>

    </genEnums>

    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ParameterKind">

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/IN"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/OUT"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ParameterKind/EXCEPTION"/>

    </genEnums>

    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ComponentInstanceRole">

    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tdl.ecore#//ComponentInstanceRole">

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/SUT"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/SUT"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/Tester"/>

      <genEnumLiterals ecoreEnumLiteral="tdl.ecore#//ComponentInstanceRole/Tester"/>
@@ -199,6 +204,7 @@ 
    <genClasses image="false" ecoreClass="tdl.ecore#//DataUse">

    <genClasses image="false" ecoreClass="tdl.ecore#//DataUse">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/argument"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/argument"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/reduction"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/reduction"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//DataUse/collectionIndex"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//ParameterBinding">

    <genClasses ecoreClass="tdl.ecore#//ParameterBinding">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/dataUse"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ParameterBinding/dataUse"/>
@@ -222,6 +228,15 @@ 
    <genClasses ecoreClass="tdl.ecore#//FunctionCall">

    <genClasses ecoreClass="tdl.ecore#//FunctionCall">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//FunctionCall/function"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//FunctionCall/function"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Procedure">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Procedure/parameter"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//ProcedureParameter">

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//ProcedureParameter/kind"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//CollectionDataInstance">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CollectionDataInstance/member"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//VariableUse">

    <genClasses ecoreClass="tdl.ecore#//VariableUse">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/componentInstance"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/componentInstance"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/variable"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//VariableUse/variable"/>
@@ -301,6 +316,7 @@ 
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/formalParameter"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/formalParameter"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/behaviourDescription"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/behaviourDescription"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/testObjective"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//TestDescription/testObjective"/>

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//TestDescription/isLocallyOrdered"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//BehaviourDescription">

    <genClasses ecoreClass="tdl.ecore#//BehaviourDescription">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//BehaviourDescription/behaviour"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//BehaviourDescription/behaviour"/>
@@ -312,6 +328,7 @@ 
    <genClasses image="false" ecoreClass="tdl.ecore#//CombinedBehaviour">

    <genClasses image="false" ecoreClass="tdl.ecore#//CombinedBehaviour">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/periodic"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/periodic"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/exceptional"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/exceptional"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//CombinedBehaviour/scope"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//PeriodicBehaviour">

    <genClasses ecoreClass="tdl.ecore#//PeriodicBehaviour">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//PeriodicBehaviour/block"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//PeriodicBehaviour/block"/>
@@ -347,6 +364,7 @@ 
    <genClasses ecoreClass="tdl.ecore#//Assertion">

    <genClasses ecoreClass="tdl.ecore#//Assertion">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/otherwise"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/otherwise"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/condition"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/condition"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Assertion/scope"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Stop"/>

    <genClasses ecoreClass="tdl.ecore#//Stop"/>

    <genClasses ecoreClass="tdl.ecore#//Break"/>

    <genClasses ecoreClass="tdl.ecore#//Break"/>
@@ -374,10 +392,16 @@ 
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ComponentInstanceBinding/actualComponent"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ComponentInstanceBinding/actualComponent"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Interaction">

    <genClasses ecoreClass="tdl.ecore#//Interaction">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/sourceGate"/>

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Interaction/isTrigger"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/target"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/target"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/argument"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/argument"/>

    </genClasses>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//ProcedureCall">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ProcedureCall/procedure"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//ProcedureCall/source"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Message">

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Message/isTrigger"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Message/sourceGate"/>

    </genClasses>

  </genPackages>

  </genPackages>

</genmodel:GenModel>
 
</genmodel:GenModel>

plugins/org.etsi.mts.tdl.model/plugin.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
   <extension point="org.eclipse.emf.ecore.generated_package">

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

      <!-- @generated tdl -->

      <!-- @generated tdl -->

      <package

      <package

            uri="http://www.etsi.org/spec/TDL/1.3.1"

            uri="http://www.etsi.org/spec/TDL/1.4.0"

            class="org.etsi.mts.tdl.tdlPackage"

            class="org.etsi.mts.tdl.tdlPackage"

            genModel="model/tdl.genmodel"/>

            genModel="model/tdl.genmodel"/>

   </extension>

   </extension>