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

Split generator model to avoid missing imports in tdlTables.java

parent 34bca6cc

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

+8 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE ecore:EPackage [

<!ENTITY _0 "tdl.ecore">

]>

<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="extendedconfigurations" nsURI="http://www.etsi.org/spec/TDL/1.3.1/configurations"

    nsPrefix="configurations">

  <eAnnotations source="http://www.eclipse.org/OCL/Import">

    <details key="tdl" value="tdl.ecore#/"/>

  </eAnnotations>

  <eClassifiers xsi:type="ecore:EClass" name="ExtendedTestConfiguration" eSuperTypes="&_0;#//TestConfiguration">

  <eClassifiers xsi:type="ecore:EClass" name="ExtendedTestConfiguration" eSuperTypes="tdl.ecore#//TestConfiguration">

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

        upperBound="-1" eType="#//TestConfigurationInstance" containment="true"/>

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

        upperBound="-1" eType="#//TestConfigurationOperation" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="TestConfigurationInstance" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="TestConfigurationInstance" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" lowerBound="1"

        eType="ecore:EClass &_0;#//TestConfiguration"/>

        eType="ecore:EClass tdl.ecore#//TestConfiguration"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="TestConfigurationOperation" abstract="true"

      eSuperTypes="&_0;#//Element">

      eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"

        eType="#//ComponentReference" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ComponentReference" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="ComponentReference" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"

        eType="ecore:EClass &_0;#//ComponentInstance"/>

        eType="ecore:EClass tdl.ecore#//ComponentInstance"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" lowerBound="1"

        eType="#//TestConfigurationInstance"/>

  </eClassifiers>
@@ -35,10 +32,10 @@ 
  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ComponentHide" eSuperTypes="#//TestConfigurationOperation"/>

  <eClassifiers xsi:type="ecore:EClass" name="ReassignRole" eSuperTypes="#//TestConfigurationOperation">

    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" lowerBound="1" eType="ecore:EEnum &_0;#//ComponentInstanceRole"/>

    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" lowerBound="1" eType="ecore:EEnum tdl.ecore#//ComponentInstanceRole"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ComponentAlias" eSuperTypes="#//TestConfigurationOperation"/>

  <eClassifiers xsi:type="ecore:EClass" name="ExtendedGateReference" eSuperTypes="&_0;#//GateReference">

  <eClassifiers xsi:type="ecore:EClass" name="ExtendedGateReference" eSuperTypes="tdl.ecore#//GateReference">

    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" lowerBound="1"

        eType="#//TestConfigurationInstance"/>

  </eClassifiers>

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

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.etsi.mts.tdl.model/src-gen" modelPluginID="org.etsi.mts.tdl.model"

    redirection="" modelName="Tdl" importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0"

    copyrightFields="false" usedGenPackages="tdl.genmodel#//tdl" operationReflection="true"

    importOrganizing="true">

  <foreignModel>configurations.ecore</foreignModel>

  <genPackages prefix="ExtendedConfigurations" basePackage="org.etsi.mts.tdl" disposableProviderFactory="true"

      ecorePackage="configurations.ecore#/">

    <genClasses ecoreClass="configurations.ecore#//ExtendedTestConfiguration">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configurations.ecore#//ExtendedTestConfiguration/configurations"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configurations.ecore#//ExtendedTestConfiguration/operations"/>

    </genClasses>

    <genClasses ecoreClass="configurations.ecore#//TestConfigurationInstance">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configurations.ecore#//TestConfigurationInstance/configuration"/>

    </genClasses>

    <genClasses image="false" ecoreClass="configurations.ecore#//TestConfigurationOperation">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference configurations.ecore#//TestConfigurationOperation/component"/>

    </genClasses>

    <genClasses ecoreClass="configurations.ecore#//ComponentReference">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configurations.ecore#//ComponentReference/component"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configurations.ecore#//ComponentReference/configuration"/>

    </genClasses>

    <genClasses ecoreClass="configurations.ecore#//ComponentMerge">

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

    </genClasses>

    <genClasses ecoreClass="configurations.ecore#//ComponentHide"/>

    <genClasses ecoreClass="configurations.ecore#//ReassignRole">

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute configurations.ecore#//ReassignRole/role"/>

    </genClasses>

    <genClasses ecoreClass="configurations.ecore#//ComponentAlias"/>

    <genClasses ecoreClass="configurations.ecore#//ExtendedGateReference">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configurations.ecore#//ExtendedGateReference/configuration"/>

    </genClasses>

  </genPackages>

</genmodel:GenModel>

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

+27 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE ecore:EPackage [

<!ENTITY _0 "tdl.ecore">

]>

<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="structuredobjectives" nsURI="http://www.etsi.org/spec/TDL/1.3.1/structured"

    nsPrefix="structured">

  <eAnnotations source="http://www.eclipse.org/OCL/Import">

    <details key="tdl" value="tdl.ecore#/"/>

  </eAnnotations>

  <eClassifiers xsi:type="ecore:EClass" name="StructuredTestObjective" eSuperTypes="&_0;#//TestObjective">

    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass &_0;#//TestConfiguration"/>

  <eClassifiers xsi:type="ecore:EClass" name="StructuredTestObjective" eSuperTypes="tdl.ecore#//TestObjective">

    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass tdl.ecore#//TestConfiguration"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="initialConditions" eType="#//InitialConditions"

        containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="expectedBehaviour" eType="#//ExpectedBehaviour"
@@ -21,36 +18,36 @@ 
    <eStructuralFeatures xsi:type="ecore:EReference" name="variants" eType="#//Variants"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="InitialConditions" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="InitialConditions" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="conditions" lowerBound="1"

        eType="#//EventSequence" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EventSequence" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="EventSequence" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"

        eType="#//EventOccurrence" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrence" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrence" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="timeConstraint" upperBound="-1"

        eType="ecore:EClass &_0;#//TimeConstraint" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="timeLabel" eType="ecore:EClass &_0;#//TimeLabel"

        eType="ecore:EClass tdl.ecore#//TimeConstraint" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="timeLabel" eType="ecore:EClass tdl.ecore#//TimeLabel"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ExpectedBehaviour" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="ExpectedBehaviour" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="whenClause" eType="#//EventSequence"

        containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="thenClause" lowerBound="1"

        eType="#//EventSequence" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="FinalConditions" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="FinalConditions" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="conditions" lowerBound="1"

        eType="#//EventSequence" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="PICSReference" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="PICSReference" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="pics" lowerBound="1" eType="#//PICS"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="PICS" eSuperTypes="&_0;#//PackageableElement"/>

  <eClassifiers xsi:type="ecore:EClass" name="Entity" eSuperTypes="&_0;#//PackageableElement"/>

  <eClassifiers xsi:type="ecore:EClass" name="Event" eSuperTypes="&_0;#//PackageableElement"/>

  <eClassifiers xsi:type="ecore:EClass" name="PICS" eSuperTypes="tdl.ecore#//PackageableElement"/>

  <eClassifiers xsi:type="ecore:EClass" name="Entity" eSuperTypes="tdl.ecore#//PackageableElement"/>

  <eClassifiers xsi:type="ecore:EClass" name="Event" eSuperTypes="tdl.ecore#//PackageableElement"/>

  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrenceSpecification" eSuperTypes="#//EventOccurrence">

    <eStructuralFeatures xsi:type="ecore:EReference" name="entityReference" eType="#//EntityReference"

        containment="true"/>
@@ -61,30 +58,30 @@ 
    <eStructuralFeatures xsi:type="ecore:EReference" name="eventArgument" eType="#//Value"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EntityReference" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="EntityReference" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="entity" eType="#//Entity"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="ecore:EClass &_0;#//ComponentInstance"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="ecore:EClass tdl.ecore#//ComponentInstance"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EventReference" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="EventReference" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="event" lowerBound="1" eType="#//Event"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Value" abstract="true" eSuperTypes="&_0;#//Element"/>

  <eClassifiers xsi:type="ecore:EClass" name="EventArgument" eSuperTypes="&_0;#//Element"/>

  <eClassifiers xsi:type="ecore:EClass" name="Value" abstract="true" eSuperTypes="tdl.ecore#//Element"/>

  <eClassifiers xsi:type="ecore:EClass" name="EventArgument" eSuperTypes="tdl.ecore#//Element"/>

  <eClassifiers xsi:type="ecore:EClass" name="DataReference" eSuperTypes="#//Value">

    <eStructuralFeatures xsi:type="ecore:EReference" name="content" lowerBound="1"

        eType="ecore:EClass &_0;#//StaticDataUse" containment="true"/>

        eType="ecore:EClass tdl.ecore#//StaticDataUse" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Content" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="Content" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Value"

        containment="true"/>

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

        upperBound="-1" eType="#//Content" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="member" eType="ecore:EClass &_0;#//Member"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="member" eType="ecore:EClass tdl.ecore#//Member"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="LiteralValue" eSuperTypes="#//Value">

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

        upperBound="-1" eType="#//Content" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" eType="ecore:EClass &_0;#//DataType"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="dataType" eType="ecore:EClass tdl.ecore#//DataType"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="ContentReference" eSuperTypes="#//Value">

    <eStructuralFeatures xsi:type="ecore:EReference" name="content" lowerBound="1"
@@ -108,21 +105,21 @@ 
    <eStructuralFeatures xsi:type="ecore:EReference" name="occurrenceArgument" eType="#//Value"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EventSpecificationTemplate" eSuperTypes="&_0;#//PackageableElement">

  <eClassifiers xsi:type="ecore:EClass" name="EventSpecificationTemplate" eSuperTypes="tdl.ecore#//PackageableElement">

    <eStructuralFeatures xsi:type="ecore:EReference" name="eventSpecification" lowerBound="1"

        eType="#//EventOccurrenceSpecification" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EntityBinding" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="EntityBinding" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="templateEntity" lowerBound="1"

        eType="#//EntityReference" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="occurrenceEntity" lowerBound="1"

        eType="#//EntityReference" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Variants" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="Variants" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="variants" upperBound="-1"

        eType="#//TestObjectiveVariant" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="TestObjectiveVariant" eSuperTypes="&_0;#//TestObjective">

  <eClassifiers xsi:type="ecore:EClass" name="TestObjectiveVariant" eSuperTypes="tdl.ecore#//TestObjective">

    <eStructuralFeatures xsi:type="ecore:EReference" name="picsReference" upperBound="-1"

        eType="#//PICSReference" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"
@@ -132,7 +129,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="VariantBinding" eSuperTypes="&_0;#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="VariantBinding" eSuperTypes="tdl.ecore#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//Value"

        containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="boundTo" lowerBound="1"

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

0 → 100644
+102 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+3 −124

File changed.

Preview size limit exceeded, changes collapsed.