Commit d2b90533 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'master' 

Grammar and other refinements, fix for missing dependency

See merge request !11
parents 40e57e9e 5851a37a

org.etsi.mts.tdl.parent/pom.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
		<module>../plugins/org.etsi.mts.tdl.tx</module>

		<module>../plugins/org.etsi.mts.tdl.tx.ide</module>

		<module>../plugins/org.etsi.mts.tdl.tx.ui</module>

		<module>../plugins/org.etsi.mts.tdl.tx.tests</module> 

		<module>../plugins/org.etsi.mts.tdl.txi</module>

		<module>../plugins/org.etsi.mts.tdl.txi.ide</module>

		<module>../plugins/org.etsi.mts.tdl.txi.ui</module>

org.etsi.mts.tdl.parent/top.target

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
	<unit id="org.apache.poi.ooxml" version="4.1.1.v20221112-0806"/>

	<unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20221112-0806"/>

	<unit id="org.apache.xmlbeans" version="3.1.0.v20221112-0806"/>

	<unit id="org.apache.commons.commons-compress" version="0.0.0"/>

	<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>

</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

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

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ 
        eType="ecore:EClass tdl.ecore#//TimeConstraint" containment="true"/>

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

        containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="occurrence" eType="#//EventOccurrenceSpecification"

        containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="template" eType="#//EventTemplateOccurrence"

        containment="true"/>

  </eClassifiers>

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

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

plugins/org.etsi.mts.tdl.tools.to.docx.poi/META-INF/MANIFEST.MF

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.core.runtime, 
 org.apache.logging.log4j.slf4j2.impl,

 org.apache.commons.lang3,

 org.apache.commons.commons-collections4,

 org.apache.commons.commons-compress, 

 org.apache.poi;bundle-version="[4.0.0,5.0.0)",

 org.apache.poi.ooxml;bundle-version="[4.0.0,5.0.0)",

 org.apache.poi.ooxml.schemas;bundle-version="[4.0.0,5.0.0)",

plugins/org.etsi.mts.tdl.tx.tests/src/models/TDL.expected

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Package: TDL

  Annotation

  ConstraintType: length

  ConstraintType: minLength

  ConstraintType: maxLength

  ConstraintType: range

  ConstraintType: format

  ConstraintType: union

  ConstraintType: uniontype

  SimpleDataType: Boolean

  SimpleDataType: Integer

  SimpleDataType: String

  SimpleDataType: Verdict

  SimpleDataInstance: True

  SimpleDataInstance: False

  SimpleDataInstance: pass

  SimpleDataInstance: fail

  SimpleDataInstance: inconclusive

  Time: second

  AnnotationType: Master

  AnnotationType: MappingName

  AnnotationType: Version

  AnnotationType: check

  AnnotationType: where

  AnnotationType: PICS

  AnnotationType: Initial conditions

  AnnotationType: Expected behaviour

  AnnotationType: Final conditions

  AnnotationType: Test Purpose Description

  AnnotationType: when

  AnnotationType: then

  PredefinedFunction: ==

  PredefinedFunction: !=

  PredefinedFunction: and

  PredefinedFunction: or

  PredefinedFunction: xor

  PredefinedFunction: not

  PredefinedFunction: <

  PredefinedFunction: >

  PredefinedFunction: <=

  PredefinedFunction: >=

  PredefinedFunction: +

  PredefinedFunction: -

  PredefinedFunction: *

  PredefinedFunction: /

  PredefinedFunction: mod

  PredefinedFunction: size