From a90368a9021f66507f53696bba31f3687010f3cd Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 31 Mar 2021 00:00:00 +0000 Subject: [PATCH] TS 103 120 v1.8.1 (2021-03-31) agreed at LI#56-e (Online, 2021-02-15) --- .../ts_103120_ETSIDictionaryDefinitions.xml | 147 +++++++++-- .../mutliple-auth-example-request.xml | 2 +- 103120/examples/request1.xml | 10 +- 103120/examples/request2.xml | 6 +- 103120/examples/request3.xml | 8 +- 103120/examples/request4.xml | 14 +- ...-Delivery.xml => request5-Binary-Deli.xml} | 8 +- ...XML-Delivery.xml => request5-XML-Deli.xml} | 8 +- 103120/examples/response1.xml | 6 +- 103120/examples/response2.xml | 12 +- 103120/examples/response3.xml | 8 +- 103120/examples/response4.xml | 6 +- 103120/examples/response5.xml | 6 +- ...sd => ts_103120v010801p0_Dictionaries.xsd} | 0 ...20v010801p0_ETSIDictionaryDefinitions.xml} | 183 ++++++++++++-- .../mutliple-auth-example-request.xml | 51 ++++ 103120/portal/examples/request1.xml | 10 +- 103120/portal/examples/request2.xml | 6 +- 103120/portal/examples/request3.xml | 8 +- 103120/portal/examples/request4.xml | 14 +- .../examples/request5-Binary-Delivery.xml | 8 +- .../portal/examples/request5-XML-Delivery.xml | 8 +- 103120/portal/examples/response1.xml | 6 +- 103120/portal/examples/response2.xml | 12 +- 103120/portal/examples/response3.xml | 8 +- 103120/portal/examples/response4.xml | 6 +- 103120/portal/examples/response5.xml | 6 +- 103120/portal/schema/TS_103_280_v020401.xsd | 239 ------------------ ...d => ts_103120v010801p0_Authorisation.xsd} | 6 +- ...mmon.xsd => ts_103120v010801p0_Common.xsd} | 0 ...0_Core.xsd => ts_103120v010801p0_Core.xsd} | 0 ...ry.xsd => ts_103120v010801p0_Delivery.xsd} | 0 ...nt.xsd => ts_103120v010801p0_Document.xsd} | 6 +- ...sd => ts_103120v010801p0_Notification.xsd} | 0 ...0_Task.xsd => ts_103120v010801p0_Task.xsd} | 8 +- 103120/portal/validate_examples.py | 42 --- ...103120_Delivery.xsd => ts_103120_Deli.xsd} | 0 103120/validate_examples.py | 49 ---- 38 files changed, 443 insertions(+), 474 deletions(-) rename 103120/examples/{request5-Binary-Delivery.xml => request5-Binary-Deli.xml} (92%) rename 103120/examples/{request5-XML-Delivery.xml => request5-XML-Deli.xml} (95%) rename 103120/portal/dictionaries/{ts_103120v010401p0_Dictionaries.xsd => ts_103120v010801p0_Dictionaries.xsd} (100%) rename 103120/portal/dictionaries/{ts_103120v010401p0_ETSIDictionaryDefinitions.xml => ts_103120v010801p0_ETSIDictionaryDefinitions.xml} (61%) create mode 100644 103120/portal/examples/mutliple-auth-example-request.xml delete mode 100644 103120/portal/schema/TS_103_280_v020401.xsd rename 103120/portal/schema/{ts_103120v010501p0_Authorisation.xsd => ts_103120v010801p0_Authorisation.xsd} (93%) rename 103120/portal/schema/{ts_103120v010501p0_Common.xsd => ts_103120v010801p0_Common.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Core.xsd => ts_103120v010801p0_Core.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Delivery.xsd => ts_103120v010801p0_Delivery.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Document.xsd => ts_103120v010801p0_Document.xsd} (93%) rename 103120/portal/schema/{ts_103120v010501p0_Notification.xsd => ts_103120v010801p0_Notification.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Task.xsd => ts_103120v010801p0_Task.xsd} (97%) delete mode 100644 103120/portal/validate_examples.py rename 103120/schema/{ts_103120_Delivery.xsd => ts_103120_Deli.xsd} (100%) delete mode 100644 103120/validate_examples.py diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 1a463ac..d571102 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -1,6 +1,6 @@ - + ETSI ObjectType @@ -30,7 +30,7 @@ - + ETSI AuthorisationLegalType @@ -40,7 +40,7 @@ - + ETSI AuthorisationPriority @@ -54,7 +54,7 @@ - + ETSI AuthorisationStatus @@ -92,7 +92,7 @@ - + ETSI AuthorisationDesiredStatus @@ -126,7 +126,7 @@ - + ETSI AuthorisationFlag @@ -144,7 +144,7 @@ - + ETSI DocumentStatus @@ -178,7 +178,7 @@ - + ETSI DocumentDesiredStatus @@ -208,17 +208,17 @@ - + ETSI DocumentType Warrant - This Document represents a legal Warrant + This Document represents a legal warrant - + ETSI NotificationType @@ -228,7 +228,7 @@ - + ETSI TaskStatus @@ -270,7 +270,7 @@ - + ETSI TaskDesiredStatus @@ -304,12 +304,12 @@ - + ETSI TaskServiceType - + - + ETSI TaskDeliveryType @@ -327,7 +327,7 @@ - + ETSI HandoverFormat @@ -357,7 +357,7 @@ - + ETSI TaskFlag @@ -372,14 +372,83 @@ IsNonLocal Indicates that the current Task shall be intercepted as a non-local identity. - + IsLocal Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. - + + + + + ETSI + LDTaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + DisclosureNotAvailable + The Task has been processed and the CSP has determined there is no product available to disclosure + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + Error + The Task has not been processed due to a problem with the underlying LD system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + LDTaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + - + + ETSI + RequestType + + + ETSI LDHandoverFormat @@ -401,4 +470,40 @@ + + ETSI + LDTaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + IsNonLocal + Indicates that the current Task shall disclose information about a non-local identity. + + + IsLocal + Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed. + + + + + ETSI + ManifestSpecification + + + TS102657-ASN.1 + Delievery according to ETSI TS 102 657 using ASN.1 encoding + + + TS102657-XML + Delievery according to ETSI TS 102 657 using XML encoding + + + diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index 198e00a..5e5f226 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.7.1 + V1.8.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index 34ecaed..e8b6a5f 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z @@ -41,7 +41,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 81476ba..67cbefd 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 59d4621..5da0df3 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 4193f541-5e19-468e-b4a3-1c636ce115e9 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index c4e750d..555974f 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2019-09-30T12:00:00Z @@ -41,11 +41,11 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 - XX-SENDER01-1234 + XX-ACTOR01-1234 2019-09-30T12:00:00Z 2019-12-30T12:00:00Z @@ -68,7 +68,7 @@ XX - RECEIVER01 + ACTOR02 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Deli.xml similarity index 92% rename from 103120/examples/request5-Binary-Delivery.xml rename to 103120/examples/request5-Binary-Deli.xml index 048837e..7d51707 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Deli.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR2 XX - RECEIVER01 + ACTOR1 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - XX-SENDER01-12345 + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Deli.xml similarity index 95% rename from 103120/examples/request5-XML-Delivery.xml rename to 103120/examples/request5-XML-Deli.xml index f663660..f9314cd 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Deli.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - ExampleLIID + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index aca92d1..25aa22c 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 1980184..9ae5d35 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 1 2015-09-01T12:00:00Z W000001 @@ -52,7 +52,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 1 7dbbc880-8750-4d3c-abe7-ea4a17646045 @@ -89,7 +89,7 @@ XX - RECVER01 + ACTOR02 3000 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 6487a8d..e3b1537 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -33,7 +33,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 2 4193f541-5e19-468e-b4a3-1c636ce115e9 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index 4a5e16c..a8dc811 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index 030867e..e210444 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -8,16 +8,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd rename to 103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd diff --git a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml similarity index 61% rename from 103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml rename to 103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml index 477914c..d571102 100644 --- a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml +++ b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml @@ -1,6 +1,6 @@ - + ETSI ObjectType @@ -18,11 +18,19 @@ Task - A Task Object as defined in section 8.2 - + An LI Task Object as defined in section 8.2 + + + LDTask + An LD Task Object as defined in section 8.3 + + + Delivery + A Delivery Object as defined in section 10 + - + ETSI AuthorisationLegalType @@ -32,7 +40,7 @@ - + ETSI AuthorisationPriority @@ -46,7 +54,7 @@ - + ETSI AuthorisationStatus @@ -84,7 +92,7 @@ - + ETSI AuthorisationDesiredStatus @@ -118,7 +126,7 @@ - + ETSI AuthorisationFlag @@ -136,7 +144,7 @@ - + ETSI DocumentStatus @@ -170,7 +178,7 @@ - + ETSI DocumentDesiredStatus @@ -200,17 +208,17 @@ - + ETSI DocumentType Warrant - This Document represents a legal Warrant + This Document represents a legal warrant - + ETSI NotificationType @@ -220,7 +228,7 @@ - + ETSI TaskStatus @@ -262,7 +270,7 @@ - + ETSI TaskDesiredStatus @@ -296,12 +304,12 @@ - + ETSI TaskServiceType - + - + ETSI TaskDeliveryType @@ -319,7 +327,7 @@ - + ETSI HandoverFormat @@ -349,7 +357,7 @@ - + ETSI TaskFlag @@ -361,6 +369,141 @@ IsEmergency Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + IsNonLocal + Indicates that the current Task shall be intercepted as a non-local identity. + + + IsLocal + Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. + + + + + ETSI + LDTaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + DisclosureNotAvailable + The Task has been processed and the CSP has determined there is no product available to disclosure + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + Error + The Task has not been processed due to a problem with the underlying LD system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + LDTaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + + + ETSI + RequestType + + + + ETSI + LDHandoverFormat + + + TS102657 + Handed over in ETSI TS 102 657 format, using HI-B + + + EncapsulatedTS102657 + Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10 + + + TS103120 + Handed over using the DeliveryObject as described in clause 10 + + + TS103707 + Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10 + + + + + ETSI + LDTaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + IsNonLocal + Indicates that the current Task shall disclose information about a non-local identity. + + + IsLocal + Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed. + + + ETSI + ManifestSpecification + + + TS102657-ASN.1 + Delievery according to ETSI TS 102 657 using ASN.1 encoding + + + TS102657-XML + Delievery according to ETSI TS 102 657 using XML encoding + + + diff --git a/103120/portal/examples/mutliple-auth-example-request.xml b/103120/portal/examples/mutliple-auth-example-request.xml new file mode 100644 index 0000000..5e5f226 --- /dev/null +++ b/103120/portal/examples/mutliple-auth-example-request.xml @@ -0,0 +1,51 @@ + + +
+ + XX + Sender + + + XX + Receiver + + d442c58c-d5e1-4fd9-90ec-9c228ad947f1 + 2020-09-22T08:06:17.025833Z + + V1.8.1 + XX + v1.1.1 + +
+ + + + + 1 + + + cd3994b1-e5f3-4b59-a852-5fecd02bd247 + + Single Approval + + + + + + 2 + + + 64e8681a-a4de-4dea-9686-4a2a15e54786 + + First of two approvals + + + Second of two approvals + + + + + + + + \ No newline at end of file diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index 94e2680..e8b6a5f 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z @@ -41,7 +41,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index 4841ccf..67cbefd 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index 4de508d..5da0df3 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 4193f541-5e19-468e-b4a3-1c636ce115e9 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index d3a0da0..555974f 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2019-09-30T12:00:00Z @@ -41,11 +41,11 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 - XX-SENDER01-1234 + XX-ACTOR01-1234 2019-09-30T12:00:00Z 2019-12-30T12:00:00Z @@ -68,7 +68,7 @@ XX - RECEIVER01 + ACTOR02 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index ae0caca..7d51707 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR2 XX - RECEIVER01 + ACTOR1 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - XX-SENDER01-12345 + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index b70a8f7..f9314cd 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - ExampleLIID + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index 5378b8e..25aa22c 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 73da83e..9ae5d35 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 1 2015-09-01T12:00:00Z W000001 @@ -52,7 +52,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 1 7dbbc880-8750-4d3c-abe7-ea4a17646045 @@ -89,7 +89,7 @@ XX - RECVER01 + ACTOR02 3000 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 44ba51e..e3b1537 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -33,7 +33,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 2 4193f541-5e19-468e-b4a3-1c636ce115e9 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index 39c27e6..a8dc811 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index e135903..e210444 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -8,16 +8,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/schema/TS_103_280_v020401.xsd b/103120/portal/schema/TS_103_280_v020401.xsd deleted file mode 100644 index 1f32155..0000000 --- a/103120/portal/schema/TS_103_280_v020401.xsd +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd similarity index 93% rename from 103120/portal/schema/ts_103120v010501p0_Authorisation.xsd rename to 103120/portal/schema/ts_103120v010801p0_Authorisation.xsd index 14b50d7..72e87c0 100644 --- a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Authorisation" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Authorisation" + xmlns="http://uri.etsi.org/03120/common/2020/09/Authorisation" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Authorisation" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -26,7 +26,7 @@ - + diff --git a/103120/portal/schema/ts_103120v010501p0_Common.xsd b/103120/portal/schema/ts_103120v010801p0_Common.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Common.xsd rename to 103120/portal/schema/ts_103120v010801p0_Common.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Core.xsd b/103120/portal/schema/ts_103120v010801p0_Core.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Core.xsd rename to 103120/portal/schema/ts_103120v010801p0_Core.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Delivery.xsd b/103120/portal/schema/ts_103120v010801p0_Delivery.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Delivery.xsd rename to 103120/portal/schema/ts_103120v010801p0_Delivery.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Document.xsd b/103120/portal/schema/ts_103120v010801p0_Document.xsd similarity index 93% rename from 103120/portal/schema/ts_103120v010501p0_Document.xsd rename to 103120/portal/schema/ts_103120v010801p0_Document.xsd index 86b7192..af6f139 100644 --- a/103120/portal/schema/ts_103120v010501p0_Document.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Document.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Document" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Document" + xmlns="http://uri.etsi.org/03120/common/2020/09/Document" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Document" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -24,7 +24,7 @@ - + diff --git a/103120/portal/schema/ts_103120v010501p0_Notification.xsd b/103120/portal/schema/ts_103120v010801p0_Notification.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Notification.xsd rename to 103120/portal/schema/ts_103120v010801p0_Notification.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Task.xsd b/103120/portal/schema/ts_103120v010801p0_Task.xsd similarity index 97% rename from 103120/portal/schema/ts_103120v010501p0_Task.xsd rename to 103120/portal/schema/ts_103120v010801p0_Task.xsd index ed8974e..ae3e65e 100644 --- a/103120/portal/schema/ts_103120v010501p0_Task.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Task.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2019/10/Task" - targetNamespace="http://uri.etsi.org/03120/common/2019/10/Task" + xmlns="http://uri.etsi.org/03120/common/2020/09/Task" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -23,7 +23,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/103120/portal/validate_examples.py b/103120/portal/validate_examples.py deleted file mode 100644 index 60c611c..0000000 --- a/103120/portal/validate_examples.py +++ /dev/null @@ -1,42 +0,0 @@ -import glob -import sys -from pathlib import Path -from pprint import pprint - -if __name__ == '__main__': - - if sys.version_info <= (3, 5): - sys.exit('ERROR: You need at least Python 3.5 to run this tool') - - try: - from lxml import etree - except ImportError: - sys.exit('ERROR: You need to install the Python lxml library') - - try: - import xmlschema - except ImportError: - sys.exit('ERROR: You need to install the xml schema library') - - - locations = [] - schemaFiles = glob.glob('schema/*.xsd') - for schemaFile in schemaFiles: - xs = xmlschema.XMLSchema(schemaFile, validation='skip') - locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) - - for schema in schemaFiles: - newSchema = xmlschema.XMLSchema(schema, locations=locations) - coreSchema.import_schema(newSchema.default_namespace, schema) - - examples = glob.glob('examples/*.xml') - for example in examples: - try: - coreSchema.validate(example) - print ("{0} passed validation".format(example)) - except Exception as ex: - print ("{0} failed validation: {1}".format(example, ex)) - - print ('Done') \ No newline at end of file diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Deli.xsd similarity index 100% rename from 103120/schema/ts_103120_Delivery.xsd rename to 103120/schema/ts_103120_Deli.xsd diff --git a/103120/validate_examples.py b/103120/validate_examples.py deleted file mode 100644 index 133bad9..0000000 --- a/103120/validate_examples.py +++ /dev/null @@ -1,49 +0,0 @@ -import glob -import sys -from pathlib import Path -from pprint import pprint - -if __name__ == '__main__': - - if sys.version_info <= (3, 5): - sys.exit('ERROR: You need at least Python 3.5 to run this tool') - - try: - from lxml import etree - except ImportError: - sys.exit('ERROR: You need to install the Python lxml library') - - try: - import xmlschema - except ImportError: - sys.exit('ERROR: You need to install the xml schema library') - - - locations = [] - schemaFiles = glob.glob('schema/*.xsd') - for schemaFile in schemaFiles: - xs = xmlschema.XMLSchema(schemaFile, validation='skip') - locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - - etsiSchema = str(Path('../103280/TS_103_280.xsd')) - xs = xmlschema.XMLSchema(etsiSchema, validation='skip') - locations.append((xs.default_namespace, str(Path("../" + etsiSchema)))) - - for location in locations: - print (location) - - coreSchema = xmlschema.XMLSchema('schema/ts_103120_Core.xsd', locations=locations) - - for schema in schemaFiles: - newSchema = xmlschema.XMLSchema(schema, locations=locations) - coreSchema.import_schema(newSchema.default_namespace, schema) - - examples = glob.glob('examples/*.xml') - for example in examples: - try: - coreSchema.validate(example) - print ("{0} passed validation".format(example)) - except Exception as ex: - print ("{0} failed validation: {1}".format(example, ex)) - - print ('Done') \ No newline at end of file -- GitLab