From fa5710beb12c5a96e9f025d740e1fd2d2d378378 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 18 Feb 2025 17:26:52 +0000 Subject: [PATCH 01/13] Updates to support CR --- .../ts_103120_ETSIDictionaryDefinitions.xml | 50 +++++++++++++++++++ 103120/schema/xsd/ts_103120_Common.xsd | 18 +++++++ 103120/schema/xsd/ts_103120_Core.xsd | 3 ++ 103120/schema/xsd/ts_103120_Delivery.xsd | 8 +++ 4 files changed, 79 insertions(+) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 9c8bf6ce..f7d5f16f 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -804,4 +804,54 @@ + + + ETSI + DeliveryStatus + + + Available + The Delivery is available + + + Acknowledged + The Delivery object details have been acknowledged + + + Expired + The Delivery data is no longer available due to expiry + + + Error + The Delivery has an error + + + Received + The Delivery data has been received + + + + + + ETSI + DeliveryDesiredStatus + + + Available + The Delivery is available + + + Acknowledged + The Delivery object details have been acknowledged + + + Error + The Delivery has an error + + + Received + The Delivery data has been received + + + diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index 79f28e0a..469a9bee 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -95,4 +95,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index 76cfe1db..36bfdc8e 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -127,6 +127,9 @@ + + + diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index 96479cea..f29b6617 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -13,6 +13,8 @@ + + @@ -52,6 +54,7 @@ + @@ -90,4 +93,9 @@ + + + + + \ No newline at end of file -- GitLab From ec61b9d7bf7f172d4c6b362648a152baa2a2f890 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 18 Feb 2025 17:29:27 +0000 Subject: [PATCH 02/13] Fixed extra space --- 103120/schema/xsd/ts_103120_Common.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index 469a9bee..35731762 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -95,7 +95,6 @@ - -- GitLab From c5e9d216ea4ed59dbe54dc0658e8524d0df78e08 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 10:23:14 +0000 Subject: [PATCH 03/13] Update to align binary data object with latest 707 --- 103120/schema/xsd/ts_103120_Common.xsd | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index 35731762..eceb9a5b 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -107,9 +107,28 @@ - + + + + + + + + + + + + + + + + + + + + -- GitLab From b6058750f6584272804e42ae9ec30fc8d6b5e041 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 10:26:26 +0000 Subject: [PATCH 04/13] namespace fix --- 103120/schema/xsd/ts_103120_Common.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index eceb9a5b..d077a024 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -126,9 +126,9 @@ - + - + -- GitLab From d2925bd6679ac4a92ca79cb27b3972769af30110 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 11:14:43 +0000 Subject: [PATCH 05/13] Removed repeated definitions --- 103120/schema/xsd/ts_103120_Common.xsd | 2 -- 103120/schema/xsd/ts_103120_Delivery.xsd | 23 +++-------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index d077a024..690aed1e 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -107,10 +107,8 @@ - - diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index f29b6617..307aa73e 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -61,20 +61,9 @@ - - - - - - - - - - - - - - + + + @@ -87,12 +76,6 @@ - - - - - - -- GitLab From 409b43e8457d91b9885d52c432fc6e6e9e7dee23 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 13:39:07 +0000 Subject: [PATCH 06/13] Update to make start and end optional --- 103120/schema/xsd/ts_103120_Common.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index 690aed1e..1d28b2b4 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -97,8 +97,8 @@ - - + + -- GitLab From 37d1f90fcb1189bd6c7f24f87b8df3274921ec16 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 13:57:24 +0000 Subject: [PATCH 07/13] Updates based on comments --- 103120/schema/xsd/ts_103120_Common.xsd | 4 +++- 103120/schema/xsd/ts_103120_Delivery.xsd | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index 1d28b2b4..e9b89998 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -101,14 +101,16 @@ - + + + diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index 307aa73e..5a3aaaea 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -54,7 +54,7 @@ - + @@ -76,9 +76,9 @@ - + - + \ No newline at end of file -- GitLab From 914bc11c6c0712c1554de2d83f58f1b4605c2688 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 13:59:17 +0000 Subject: [PATCH 08/13] Typo fix --- 103120/schema/xsd/ts_103120_Delivery.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index 5a3aaaea..3f9bcb0d 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -76,7 +76,7 @@ - + -- GitLab From 095bcd5adefec316846a99c24e2698ae3f5aa781 Mon Sep 17 00:00:00 2001 From: masalawala Date: Tue, 25 Feb 2025 14:41:20 +0000 Subject: [PATCH 09/13] Make naming consistent --- 103120/schema/xsd/ts_103120_Delivery.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index 3f9bcb0d..b2064f87 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -54,7 +54,7 @@ - + -- GitLab From bd4df4a75e7c2884a09ec7fb90a7b34ddeb02c6f Mon Sep 17 00:00:00 2001 From: masalawala Date: Wed, 26 Feb 2025 00:46:03 +0000 Subject: [PATCH 10/13] Dictionary meaning updates --- .../ts_103120_ETSIDictionaryDefinitions.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index f7d5f16f..2b816ab1 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -811,7 +811,7 @@ Available - The Delivery is available + The Delivery object is available Acknowledged @@ -819,15 +819,15 @@ Expired - The Delivery data is no longer available due to expiry + The data related to the Delivery is no longer available due to expiry Error - The Delivery has an error + The Delivery object or underlying data has an error Received - The Delivery data has been received + The data related to the Delivery object has been received @@ -838,7 +838,7 @@ Available - The Delivery is available + The Delivery object is available Acknowledged @@ -846,11 +846,11 @@ Error - The Delivery has an error + The Delivery object or underlying data had an error whilst handling Received - The Delivery data has been received + The data related to the Delivery object has been received -- GitLab From fa0f16a1438b33c3592eb2ded47dabb9540ccee5 Mon Sep 17 00:00:00 2001 From: masalawala Date: Thu, 27 Feb 2025 10:37:10 +0000 Subject: [PATCH 11/13] Changed Url to URL --- 103120/schema/xsd/ts_103120_Common.xsd | 2 +- 103120/schema/xsd/ts_103120_Delivery.xsd | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index e9b89998..b7ddb257 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -101,7 +101,7 @@ - + diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index b2064f87..6e0a813a 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -54,7 +54,7 @@ - + @@ -76,9 +76,9 @@ - + - + \ No newline at end of file -- GitLab From e37726f448c27aa4f6de339319a535603c7e1f1b Mon Sep 17 00:00:00 2001 From: masalawala Date: Thu, 27 Feb 2025 11:20:48 +0000 Subject: [PATCH 12/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Steije van Schelt <239-svs@users.noreply.forge.etsi.org> --- 103120/schema/xsd/ts_103120_Delivery.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index 6e0a813a..4e46d1fd 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -54,7 +54,7 @@ - + -- GitLab From 8c24c972d5373648498ff41d7fbd2ae7bb692589 Mon Sep 17 00:00:00 2001 From: masalawala Date: Thu, 27 Feb 2025 11:33:15 +0000 Subject: [PATCH 13/13] Given difference between checksums in 707 and 120 decided to remove use of group --- 103120/schema/xsd/ts_103120_Common.xsd | 15 +-------------- 103120/schema/xsd/ts_103120_Delivery.xsd | 10 +++++++++- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index b7ddb257..f7d5471d 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -101,19 +101,6 @@ - - - - - - - - - - - - - @@ -126,7 +113,7 @@ - + diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd index 4e46d1fd..7103d29a 100644 --- a/103120/schema/xsd/ts_103120_Delivery.xsd +++ b/103120/schema/xsd/ts_103120_Delivery.xsd @@ -78,7 +78,15 @@ - + + + + + + + + + \ No newline at end of file -- GitLab