Skip to content

Commit b90729f

Browse files
costas80costas80
committed
Pull request #42: Development
Merge in ITB/gitb-types from development to master * commit 'de76e3983a5bd9ffb8a6a0dc476c9c406036bc31': Preparation for release 1.28.0 [ITB-1914] Extend the metadata for test suites and test cases to include scopes and dependencies [ITB-1910] Support configurable timeouts for handler service calls for send, receive, verify, process and interact steps [ITB-1910] Support configurable timeouts for handler service calls for send, receive, verify, process and interact steps [ITB-1831] Support an iterator approach in the foreach step as an alternative to index based iterations (for lists and maps) Update for release 1.27.2 Preparation for next development phase
2 parents 4a0da17 + de76e39 commit b90729f

6 files changed

Lines changed: 57 additions & 7 deletions

File tree

‎gitb-types-jakarta/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.27.4</version>
9+
<version>1.28.0</version>
1010
</parent>
1111
<artifactId>gitb-types-jakarta</artifactId>
1212
<name>${project.groupId}:${project.artifactId}</name>

‎gitb-types-javax/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.27.4</version>
9+
<version>1.28.0</version>
1010
</parent>
1111
<artifactId>gitb-types</artifactId>
1212
<name>${project.groupId}:${project.artifactId}</name>

‎gitb-types-specs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.27.4</version>
9+
<version>1.28.0</version>
1010
</parent>
1111
<artifactId>gitb-types-specs</artifactId>
1212
<name>${project.groupId}:${project.artifactId}</name>

‎gitb-types-specs/src/main/resources/schema/gitb_core.xsd‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,36 @@
3535
<xsd:element name="update" type="Update" minOccurs="0"/>
3636
<xsd:element name="tags" type="Tags" minOccurs="0"/>
3737
<xsd:element name="specification" type="SpecificationInfo" minOccurs="0"/>
38+
<xsd:element name="scopes" type="Scopes" minOccurs="0"/>
39+
<xsd:element name="dependencies" type="Dependencies" minOccurs="0"/>
3840
</xsd:all>
3941
</xsd:complexType>
42+
<xsd:complexType name="Scopes">
43+
<xsd:sequence>
44+
<xsd:element name="scope" type="Scope" maxOccurs="unbounded"/>
45+
</xsd:sequence>
46+
</xsd:complexType>
47+
<xsd:complexType name="Dependencies">
48+
<xsd:sequence>
49+
<xsd:element name="dependency" type="Dependency" maxOccurs="unbounded"/>
50+
</xsd:sequence>
51+
</xsd:complexType>
52+
<xsd:complexType name="Scope">
53+
<xsd:all>
54+
<xsd:element name="identifier" type="xsd:string" minOccurs="0"/>
55+
<xsd:element name="version" type="xsd:string" minOccurs="0"/>
56+
<xsd:element name="description" type="xsd:string" minOccurs="0"/>
57+
<xsd:element name="uri" type="xsd:string" minOccurs="0"/>
58+
</xsd:all>
59+
</xsd:complexType>
60+
<xsd:complexType name="Dependency">
61+
<xsd:all>
62+
<xsd:element name="identifier" type="xsd:string" minOccurs="0"/>
63+
<xsd:element name="version" type="xsd:string" minOccurs="0"/>
64+
<xsd:element name="description" type="xsd:string" minOccurs="0"/>
65+
<xsd:element name="uri" type="xsd:string" minOccurs="0"/>
66+
</xsd:all>
67+
</xsd:complexType>
4068
<xsd:complexType name="Tags">
4169
<xsd:sequence>
4270
<xsd:element name="tag" type="Tag" maxOccurs="unbounded"/>
@@ -231,6 +259,16 @@
231259
<xsd:pattern value="($[a-zA-Z][a-zA-Z\-_0-9]*(\{[${}a-zA-Z\-._0-9]*\})?)|(true)|(TRUE)|(false)|(FALSE)"/>
232260
</xsd:restriction>
233261
</xsd:simpleType>
262+
<xsd:simpleType name="VariableName">
263+
<xsd:restriction base="xsd:string">
264+
<xsd:pattern value="[a-zA-Z][a-zA-Z\-_0-9]*"/>
265+
</xsd:restriction>
266+
</xsd:simpleType>
267+
<xsd:simpleType name="VariableReference">
268+
<xsd:restriction base="xsd:string">
269+
<xsd:pattern value="$[a-zA-Z][a-zA-Z\-_0-9]*(\{[${}a-zA-Z\-._0-9]*\})?"/>
270+
</xsd:restriction>
271+
</xsd:simpleType>
234272
<!-- Enumeration for usage indicator-->
235273
<xsd:simpleType name="ConfigurationType">
236274
<xsd:restriction base="xsd:string">

‎gitb-types-specs/src/main/resources/schema/gitb_tdl.xsd‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@
226226
<xsd:attribute name="reply" type="gitb:BooleanOrVariable" default="false"/>
227227
<xsd:attribute name="level" type="ErrorLevelOrVariable" default="ERROR"/>
228228
<xsd:attribute name="invert" type="xsd:boolean" default="false"/>
229+
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
230+
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
229231
</xsd:extension>
230232
</xsd:complexContent>
231233
</xsd:complexType>
@@ -263,10 +265,11 @@
263265
<xsd:element name="property" type="gitb:Configuration" minOccurs="0" maxOccurs="unbounded"/>
264266
<xsd:element name="config" type="gitb:Configuration" minOccurs="0" maxOccurs="unbounded"/>
265267
</xsd:sequence>
266-
<xsd:attribute name="from" type="gitb:StringOrVariable" use="required"/>
267-
<xsd:attribute name="to" type="gitb:StringOrVariable" use="required"/>
268+
<xsd:attribute name="from" type="gitb:StringOrVariable"/>
269+
<xsd:attribute name="to" type="gitb:StringOrVariable"/>
268270
<xsd:attribute name="txnId" type="xsd:string" use="required"/>
269271
<xsd:attribute name="handler" type="gitb:StringOrVariable" use="required"/>
272+
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
270273
</xsd:extension>
271274
</xsd:complexContent>
272275
</xsd:complexType>
@@ -326,10 +329,12 @@
326329
</xsd:sequence>
327330
<xsd:attribute name="counter" type="xsd:string" default="i"/>
328331
<xsd:attribute name="start" type="gitb:NumberOrVariable" default="0"/>
329-
<xsd:attribute name="end" type="gitb:NumberOrVariable" use="required"/>
332+
<xsd:attribute name="end" type="gitb:NumberOrVariable"/>
330333
<xsd:attribute name="title" type="gitb:StringOrVariable" default="loop"/>
331334
<xsd:attribute name="collapsed" type="xsd:boolean" default="false"/>
332335
<xsd:attribute name="stopOnChildError" type="xsd:boolean"/>
336+
<xsd:attribute name="item" type="gitb:VariableName"/>
337+
<xsd:attribute name="of" type="gitb:VariableReference"/>
333338
</xsd:extension>
334339
</xsd:complexContent>
335340
</xsd:complexType>
@@ -393,6 +398,8 @@
393398
<xsd:attribute name="level" type="ErrorLevelOrVariable" default="ERROR"/>
394399
<xsd:attribute name="output" type="xsd:string"/>
395400
<xsd:attribute name="invert" type="xsd:boolean" default="false"/>
401+
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
402+
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
396403
</xsd:extension>
397404
</xsd:complexContent>
398405
</xsd:complexType>
@@ -431,6 +438,8 @@
431438
<xsd:attribute name="blocking" type="gitb:BooleanOrVariable" default="true"/>
432439
<xsd:attribute name="handlerEnabled" type="gitb:BooleanOrVariable" default="false"/>
433440
<xsd:attribute name="handler" type="gitb:StringOrVariable"/>
441+
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
442+
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
434443
</xsd:extension>
435444
</xsd:complexContent>
436445
</xsd:complexType>
@@ -449,6 +458,7 @@
449458
</xsd:sequence>
450459
<xsd:attribute name="txnId" type="xsd:string" use="required"/>
451460
<xsd:attribute name="handler" type="gitb:StringOrVariable" use="required"/>
461+
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
452462
</xsd:extension>
453463
</xsd:complexContent>
454464
</xsd:complexType>
@@ -474,6 +484,8 @@
474484
<xsd:attribute name="output" type="xsd:string"/>
475485
<xsd:attribute name="level" type="ErrorLevelOrVariable" default="ERROR"/>
476486
<xsd:attribute name="invert" type="xsd:boolean" default="false"/>
487+
<xsd:attribute name="handlerTimeout" type="gitb:NumberOrVariable"/>
488+
<xsd:attribute name="handlerTimeoutFlag" type="gitb:VariableName"/>
477489
</xsd:extension>
478490
</xsd:complexContent>
479491
</xsd:complexType>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.27.4</version>
9+
<version>1.28.0</version>
1010
<packaging>pom</packaging>
1111
<name>${project.groupId}:${project.artifactId}</name>
1212
<description>Type definitions, WSDLs and XSDs for GITB types and services.</description>

0 commit comments

Comments
 (0)