From 31a7b40493bc215f9d91ee437c4a875217359aec Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 17 Oct 2024 15:56:13 +0100
Subject: [PATCH 1/4] Initial commit

---
 .../ts_103120_ETSIDictionaryDefinitions.xml   | 58 +++++++++++++++++++
 103120/schema/xsd/ts_103120_Common.xsd        |  6 ++
 103120/schema/xsd/ts_103120_Core.xsd          |  3 +
 103120/schema/xsd/ts_103120_Delivery.xsd      |  6 +-
 testing/xsd_compile_targets.json              |  1 +
 5 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index eb46ca4..0e720f8 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -800,4 +800,62 @@
             </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
+    <Dictionary>
+        <!--DeliveryStatus: see Clause 10.2.4 Table 10.X -->
+        <Owner>ETSI</Owner>
+        <Name>DeliveryStatus</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>Available</Value>
+                <Meaning>The Delivery is available</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>InFlight</Value>
+                <Meaning>The Delivery object details have been made available to a client</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Acknowledged</Value>
+                <Meaning>The Delivery object details have been acknowledged</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Downloaded</Value>
+                <Meaning>The Delivery data has been received</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Expired</Value>
+                <Meaning>The expiry date for this Delivery has passed</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Error</Value>
+                <Meaning>The Delivery has an error</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>
+    <Dictionary>
+        <!--DeliveryStatus: see Clause 10.2.4 Table 10.Y -->
+        <Owner>ETSI</Owner>
+        <Name>DeliveryDesiredStatus</Name>
+        <DictionaryEntries>
+            <DictionaryEntry>
+                <Value>Available</Value>
+                <Meaning>The Delivery is available</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Acknowledged</Value>
+                <Meaning>The Delivery object details have been acknowledged</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>InFlight</Value>
+                <Meaning>The Delivery object details are being processed</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Downloaded</Value>
+                <Meaning>The Delivery data has been received</Meaning>
+            </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Error</Value>
+                <Meaning>The Delivery has an error</Meaning>
+            </DictionaryEntry>
+        </DictionaryEntries>
+    </Dictionary>    
 </Dictionaries>
diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd
index cea9e81..729f300 100644
--- a/103120/schema/xsd/ts_103120_Common.xsd
+++ b/103120/schema/xsd/ts_103120_Common.xsd
@@ -70,4 +70,10 @@
             <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="Timespan">
+        <xs:sequence>
+            <xs:element name="StartTime" type="etsi:QualifiedDateTime"/>
+            <xs:element name="EndTime" type="etsi:QualifiedDateTime"/>
+        </xs:sequence>
+    </xs:complexType>
 </xs:schema>
diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd
index 76cfe1d..0c70d0e 100644
--- a/103120/schema/xsd/ts_103120_Core.xsd
+++ b/103120/schema/xsd/ts_103120_Core.xsd
@@ -127,6 +127,9 @@
         <xs:sequence>
             <xs:element name="ObjectType" type="common:DictionaryEntry" minOccurs="0"/>
             <xs:element name="LastChanged" type="etsi:QualifiedDateTime" minOccurs="0"/>
+            <xs:element name="LastChangedTimespan" type="common:Timespan" minOccurs="0"/>
+            <xs:element name="MaxObjectCount" type="xs:positiveInteger" minOccurs="0"/>
+            <xs:element name="Status" type="common:DictionaryEntry" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="LISTResponse">
diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd
index 0cb4b4c..1b29c38 100644
--- a/103120/schema/xsd/ts_103120_Delivery.xsd
+++ b/103120/schema/xsd/ts_103120_Delivery.xsd
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 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/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi707="http://uri.etsi.org/03707/2020/02" 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/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>
     <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>
     <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+    <xs:import namespace="http://uri.etsi.org/03707/2020/02"/>
     <xs:complexType name="DeliveryObject">
         <xs:complexContent>
             <xs:extension base="core:HI1Object">
@@ -13,6 +14,8 @@
                     <xs:element name="LastSequence" type="xs:boolean" minOccurs="0"/>
                     <xs:element name="Manifest" type="Manifest" minOccurs="0"/>
                     <xs:element name="Delivery" type="Delivery" minOccurs="0"/>
+                    <xs:element name="DeliveryStatus" type="common:DictionaryEntry" minOccurs="0"/>
+                    <xs:element name="DesiredDeliveryStatus" type="common:DictionaryEntry" minOccurs="0"/>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
@@ -52,6 +55,7 @@
             <xs:element name="BinaryData" type="EmbeddedBinaryData"/>
             <xs:element name="XMLData" type="EmbeddedXMLData"/>
             <xs:element name="JSONData" type="EmbeddedJSONData"/>
+            <xs:element name="URLData" type="etsi707:BinaryObject"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="EmbeddedBinaryData">
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index 8aa1774..997c25d 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -49,6 +49,7 @@
             "103120/schema/xsd/ts_103120_Task.xsd",
             "103120/schema/xsd/ts_103120_TrafficPolicy.xsd",
             "103280/TS_103_280.xsd",
+            "103707/TS_103_707.xsd",
             "testing/deps/xmldsig/xmldsig-core-schema.xsd",
             "103120/examples/xml/FooServiceSchema.xsd"
         ],
-- 
GitLab


From e469483d534c9d73314a57d0f8fd8aa7840bd593 Mon Sep 17 00:00:00 2001
From: masalawala <vishal90013@ntac.gov.uk>
Date: Thu, 24 Oct 2024 08:29:38 +0000
Subject: [PATCH 2/4] Updates match r2

---
 .../ts_103120_ETSIDictionaryDefinitions.xml   | 24 +++++++------------
 103120/schema/xsd/ts_103120_Core.xsd          |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index 0e720f8..20ceb1a 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -809,26 +809,22 @@
                 <Value>Available</Value>
                 <Meaning>The Delivery is available</Meaning>
             </DictionaryEntry>
-            <DictionaryEntry>
-                <Value>InFlight</Value>
-                <Meaning>The Delivery object details have been made available to a client</Meaning>
-            </DictionaryEntry>
             <DictionaryEntry>
                 <Value>Acknowledged</Value>
                 <Meaning>The Delivery object details have been acknowledged</Meaning>
             </DictionaryEntry>
-            <DictionaryEntry>
-                <Value>Downloaded</Value>
-                <Meaning>The Delivery data has been received</Meaning>
-            </DictionaryEntry>
             <DictionaryEntry>
                 <Value>Expired</Value>
-                <Meaning>The expiry date for this Delivery has passed</Meaning>
+                <Meaning>The Delivery data is no longer available due to expiry</Meaning>
             </DictionaryEntry>
             <DictionaryEntry>
                 <Value>Error</Value>
                 <Meaning>The Delivery has an error</Meaning>
             </DictionaryEntry>
+            <DictionaryEntry>
+                <Value>Received</Value>
+                <Meaning>The Delivery data has been received</Meaning>
+            </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
     <Dictionary>
@@ -845,17 +841,13 @@
                 <Meaning>The Delivery object details have been acknowledged</Meaning>
             </DictionaryEntry>
             <DictionaryEntry>
-                <Value>InFlight</Value>
-                <Meaning>The Delivery object details are being processed</Meaning>
+                <Value>Error</Value>
+                <Meaning>The Delivery has an error</Meaning>
             </DictionaryEntry>
             <DictionaryEntry>
-                <Value>Downloaded</Value>
+                <Value>Received</Value>
                 <Meaning>The Delivery data has been received</Meaning>
             </DictionaryEntry>
-            <DictionaryEntry>
-                <Value>Error</Value>
-                <Meaning>The Delivery has an error</Meaning>
-            </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>    
 </Dictionaries>
diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd
index 0c70d0e..36bfdc8 100644
--- a/103120/schema/xsd/ts_103120_Core.xsd
+++ b/103120/schema/xsd/ts_103120_Core.xsd
@@ -128,7 +128,7 @@
             <xs:element name="ObjectType" type="common:DictionaryEntry" minOccurs="0"/>
             <xs:element name="LastChanged" type="etsi:QualifiedDateTime" minOccurs="0"/>
             <xs:element name="LastChangedTimespan" type="common:Timespan" minOccurs="0"/>
-            <xs:element name="MaxObjectCount" type="xs:positiveInteger" minOccurs="0"/>
+            <xs:element name="MaximumObjectCount" type="xs:positiveInteger" minOccurs="0"/>
             <xs:element name="Status" type="common:DictionaryEntry" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
-- 
GitLab


From e6cf09de34c7b4de67a938ef545c38ea76a8fb87 Mon Sep 17 00:00:00 2001
From: masalawala <vishal90013@ntac.gov.uk>
Date: Thu, 24 Oct 2024 14:04:08 +0000
Subject: [PATCH 3/4] Redeclaration of BinaryObject in a group to remove
 reference to 707. In preparaation for future reference from 707

---
 103120/schema/xsd/ts_103120_Common.xsd   | 11 +++++++++++
 103120/schema/xsd/ts_103120_Delivery.xsd | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd
index 729f300..902c6f6 100644
--- a/103120/schema/xsd/ts_103120_Common.xsd
+++ b/103120/schema/xsd/ts_103120_Common.xsd
@@ -76,4 +76,15 @@
             <xs:element name="EndTime" type="etsi:QualifiedDateTime"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:group name="BinaryObjectGroup">
+        <xs:sequence>
+            <xs:element name="url" type="xs:anyURI"/>
+            <xs:element name="contentLength" type="xs:nonNegativeInteger" minOccurs="0"/>
+            <xs:element name="contentType" type="etsi103280:LongString" minOccurs="0"/>
+            <xs:element name="expiry" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+            <xs:element name="checksum" type="etsi103280:LongString" minOccurs="0"/>
+            <xs:element name="originalFilename" type="etsi103280:LongString" minOccurs="0"/>
+            <xs:element name="cspDefinedIdentifier" type="etsi103280:LongString" minOccurs="0"/>
+        </xs:sequence>
+    </xs:group>
 </xs:schema>
diff --git a/103120/schema/xsd/ts_103120_Delivery.xsd b/103120/schema/xsd/ts_103120_Delivery.xsd
index 1b29c38..b288ae8 100644
--- a/103120/schema/xsd/ts_103120_Delivery.xsd
+++ b/103120/schema/xsd/ts_103120_Delivery.xsd
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi707="http://uri.etsi.org/03707/2020/02" 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/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 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/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>
     <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>
     <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
-    <xs:import namespace="http://uri.etsi.org/03707/2020/02"/>
     <xs:complexType name="DeliveryObject">
         <xs:complexContent>
             <xs:extension base="core:HI1Object">
@@ -55,7 +54,7 @@
             <xs:element name="BinaryData" type="EmbeddedBinaryData"/>
             <xs:element name="XMLData" type="EmbeddedXMLData"/>
             <xs:element name="JSONData" type="EmbeddedJSONData"/>
-            <xs:element name="URLData" type="etsi707:BinaryObject"/>
+            <xs:element name="URLData" type="BinaryObject"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="EmbeddedBinaryData">
@@ -76,4 +75,9 @@
             <xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="BinaryObject">
+        <xs:sequence>
+            <xs:group ref="common:BinaryObjectGroup"/>
+        </xs:sequence>
+    </xs:complexType>
 </xs:schema>
-- 
GitLab


From f41ed6bc0902db09ecfe80576d04337cc6e011af Mon Sep 17 00:00:00 2001
From: masalawala <vishal90013@ntac.gov.uk>
Date: Thu, 24 Oct 2024 14:06:56 +0000
Subject: [PATCH 4/4] Fixed namespacing

---
 103120/schema/xsd/ts_103120_Common.xsd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd
index 902c6f6..a2b7e58 100644
--- a/103120/schema/xsd/ts_103120_Common.xsd
+++ b/103120/schema/xsd/ts_103120_Common.xsd
@@ -80,11 +80,11 @@
         <xs:sequence>
             <xs:element name="url" type="xs:anyURI"/>
             <xs:element name="contentLength" type="xs:nonNegativeInteger" minOccurs="0"/>
-            <xs:element name="contentType" type="etsi103280:LongString" minOccurs="0"/>
-            <xs:element name="expiry" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
-            <xs:element name="checksum" type="etsi103280:LongString" minOccurs="0"/>
-            <xs:element name="originalFilename" type="etsi103280:LongString" minOccurs="0"/>
-            <xs:element name="cspDefinedIdentifier" type="etsi103280:LongString" minOccurs="0"/>
+            <xs:element name="contentType" type="etsi:LongString" minOccurs="0"/>
+            <xs:element name="expiry" type="etsi:QualifiedMicrosecondDateTime" minOccurs="0"/>
+            <xs:element name="checksum" type="etsi:LongString" minOccurs="0"/>
+            <xs:element name="originalFilename" type="etsi:LongString" minOccurs="0"/>
+            <xs:element name="cspDefinedIdentifier" type="etsi:LongString" minOccurs="0"/>
         </xs:sequence>
     </xs:group>
 </xs:schema>
-- 
GitLab