From 41b0ee8d92fd8c9c6014835a484adfb7b8fda8a6 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 18 Sep 2020 13:35:19 +0100 Subject: [PATCH 1/3] Changes to XSD as per LI(20)P55017 --- 103120/schema/ts_103120_Authorisation.xsd | 6 +++--- 103120/schema/ts_103120_Document.xsd | 6 +++--- 103120/schema/ts_103120_Task.xsd | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index 14b50d7..72e87c0 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_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/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index 86b7192..af6f139 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_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/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index ed8974e..ae3e65e 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_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 @@ - + -- GitLab From 2a9445a65599aace917db844675db44fc8c2da2e Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 23 Sep 2020 12:07:53 +0100 Subject: [PATCH 2/3] Updating examples --- 103120/examples/request1.xml | 4 ++-- 103120/examples/request2.xml | 4 ++-- 103120/examples/request3.xml | 4 ++-- 103120/examples/request4.xml | 4 ++-- 103120/examples/request5-Binary-Delivery.xml | 4 ++-- 103120/examples/request5-XML-Delivery.xml | 4 ++-- 103120/examples/response1.xml | 4 ++-- 103120/examples/response2.xml | 4 ++-- 103120/examples/response3.xml | 4 ++-- 103120/examples/response4.xml | 4 ++-- 103120/examples/response5.xml | 4 ++-- 103120/portal/examples/request1.xml | 4 ++-- 103120/portal/examples/request2.xml | 4 ++-- 103120/portal/examples/request3.xml | 4 ++-- 103120/portal/examples/request4.xml | 4 ++-- 103120/portal/examples/request5-Binary-Delivery.xml | 4 ++-- 103120/portal/examples/request5-XML-Delivery.xml | 4 ++-- 103120/portal/examples/response1.xml | 4 ++-- 103120/portal/examples/response2.xml | 4 ++-- 103120/portal/examples/response3.xml | 4 ++-- 103120/portal/examples/response4.xml | 4 ++-- 103120/portal/examples/response5.xml | 4 ++-- 103120/validate_examples.py | 9 ++++++++- 23 files changed, 52 insertions(+), 45 deletions(-) diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index d6d9aba..94e2680 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index af4346d..4841ccf 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index fb97577..4de508d 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index daa4b57..d3a0da0 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 285d5e1..ae0caca 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index 989165e..b70a8f7 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index cc99dbc..5378b8e 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 2f867c9..73da83e 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 3e48fb7..44ba51e 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index ff14ab0..39c27e6 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index a4c69c9..e135903 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index d6d9aba..94e2680 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index af4346d..4841ccf 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index fb97577..4de508d 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index daa4b57..d3a0da0 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index 285d5e1..ae0caca 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index 989165e..b70a8f7 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index cc99dbc..5378b8e 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 2f867c9..73da83e 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 3e48fb7..44ba51e 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index ff14ab0..39c27e6 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index a4c69c9..e135903 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/validate_examples.py b/103120/validate_examples.py index 7aae339..133bad9 100644 --- a/103120/validate_examples.py +++ b/103120/validate_examples.py @@ -25,7 +25,14 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations) + 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) -- GitLab From 2b5fcbedcaa739bebc6f4820febf3006f676b8e3 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 24 Sep 2020 09:38:38 +0100 Subject: [PATCH 3/3] Updating version number in examples and adding multi-auth example --- .../mutliple-auth-example-request.xml | 51 +++++++++++++++++++ 103120/examples/request1.xml | 2 +- 103120/examples/request2.xml | 2 +- 103120/examples/request3.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/request5-Binary-Delivery.xml | 2 +- 103120/examples/request5-XML-Delivery.xml | 2 +- 103120/examples/response1.xml | 2 +- 103120/examples/response2.xml | 2 +- 103120/examples/response3.xml | 2 +- 103120/examples/response4.xml | 2 +- 103120/examples/response5.xml | 2 +- 12 files changed, 62 insertions(+), 11 deletions(-) create mode 100644 103120/examples/mutliple-auth-example-request.xml diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml new file mode 100644 index 0000000..198e00a --- /dev/null +++ b/103120/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.7.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/examples/request1.xml b/103120/examples/request1.xml index 94e2680..34ecaed 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 4841ccf..81476ba 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 4de508d..59d4621 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index d3a0da0..c4e750d 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index ae0caca..048837e 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index b70a8f7..f663660 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index 5378b8e..aca92d1 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 73da83e..1980184 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 44ba51e..6487a8d 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index 39c27e6..4a5e16c 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.6.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index e135903..030867e 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.7.1 XX v1.0 -- GitLab