From af5b28e6eaece3b85415c3ea65b958e7304a0b4f Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 17:05:18 +0000
Subject: [PATCH 1/3] Draft/ts103707/adding a format for identifiers

---
 103707/TS_103_707.xsd                      | 15 ++++++-
 103707/examples/example_new_identifier.xml | 49 ++++++++++++++++++++++
 testing/xsd_compile_targets.json           | 16 ++++++-
 3 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 103707/examples/example_new_identifier.xml

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index 591007e..e7907c2 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" version="1.6.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" version="1.6.1" elementFormDefault="qualified">
     <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+    <xs:import namespace="http://uri.etsi.org/03120/common/2020/09/Task"/>
     <!-- ************************************************************************************* -->
     <!-- Handover Item definitions including header (clause 5.3) -->
     <!-- ************************************************************************************* -->
@@ -66,7 +67,10 @@
     </xs:complexType>
     <xs:complexType name="MessagingPartyIdentifiers">
         <xs:sequence>
-            <xs:element name="identifier" type="MessagingPartyIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:choice minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="identifier" type="MessagingPartyIdentifier"/>
+                <xs:element name="qualifiedIdentifier" type="QualifiedPartyIdentifier"/>
+            </xs:choice>
         </xs:sequence>
     </xs:complexType>
     <xs:simpleType name="MessagingPartyIdentifier">
@@ -101,6 +105,13 @@
             <!-- currently no glossary entries are defined -->
         </xs:choice>
     </xs:complexType>
+    <xs:complexType name="QualifiedPartyIdentifier">
+        <xs:sequence>
+            <xs:element name="formatType" type="etsi103120:FormatType"/>
+            <xs:element name="value" type="etsi103280:LongString"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <!-- ************************************************************************************* -->
     <!-- CSP-defined container (Clause 5.6) -->
     <!-- ************************************************************************************* -->
diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
new file mode 100644
index 0000000..7477baa
--- /dev/null
+++ b/103707/examples/example_new_identifier.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<handoverItem xmlns="http://uri.etsi.org/03707/2020/02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task">
+    <header/>
+    <payload xsi:type="MessagingPayload">
+        <coreParameters>
+            <messageSender>
+                <identifiers>
+                    <qualifiedIdentifier>
+                        <formatType>
+                            <etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>
+                            <etsi103120:FormatName>EmailAddress</etsi103120:FormatName>
+                        </formatType>
+                        <value>qualified@example.com</value>
+                    </qualifiedIdentifier>
+                    <identifier>old_style_unqualified@example.com</identifier>
+                </identifiers>
+                <isTargetedParty>true</isTargetedParty>
+            </messageSender>
+            <messageReceivers>
+                <recipient>
+                    <identifiers>
+                        <qualifiedIdentifier>
+                            <formatType>
+                                <etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>
+                                <etsi103120:FormatName>EmailAddress</etsi103120:FormatName>
+                            </formatType>
+                            <value>qualified@example.com</value>
+                        </qualifiedIdentifier>
+                    </identifiers>
+                </recipient>
+            </messageReceivers>
+            <timestamp>2019-10-17T06:42:23.000000+01:00</timestamp>
+        </coreParameters>
+        <cspDefinedParameters>
+            <cspDefinedMetadata>
+                <schemaDetails>
+                    <schemaIdentifier>http://FooServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>
+                </schemaDetails>
+                <xmlData>
+                    <fooServiceDefinedParameters xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/">
+                        <item1>Foo</item1>
+                        <item2>Bar</item2>
+                        <item3>Baz</item3>
+                    </fooServiceDefinedParameters>
+                </xmlData>
+            </cspDefinedMetadata>
+        </cspDefinedParameters>
+    </payload>
+</handoverItem>
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index 3b28b43..bb4f13e 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -51,5 +51,19 @@
         "exampleFiles" : [
             "103120/examples/xml"
         ]
-    }
+    },
+    {
+        "coreSchema" : "103707/TS_103_707.xsd",
+        "supportingSchemas" : [
+            "103280/TS_103_280.xsd",
+            "103120/schema/xsd/ts_103120_Common.xsd",
+            "103120/schema/xsd/ts_103120_Core.xsd",
+            "103120/schema/xsd/ts_103120_Task.xsd",
+            "testing/deps/xmldsig/xmldsig-core-schema.xsd",
+            "103707/examples/FooServiceSchema.xsd"
+        ],
+        "exampleFiles" : [
+            "103707/examples"
+        ]
+    }    
 ]
-- 
GitLab


From 721a7cbac70dfc64351388b71ed268a3048a38b1 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Fri, 13 Oct 2023 12:14:08 +0000
Subject: [PATCH 2/3] adding a format for identifiers

---
 103707/TS_103_707.xsd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index e7907c2..a35f180 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -76,6 +76,12 @@
     <xs:simpleType name="MessagingPartyIdentifier">
         <xs:restriction base="etsi103280:LongString"/>
     </xs:simpleType>
+    <xs:complexType name="QualifiedPartyIdentifier">
+        <xs:sequence>
+            <xs:element name="formatType" type="etsi103120:FormatType"/>
+            <xs:element name="value" type="etsi103280:LongString"/>
+        </xs:sequence>
+    </xs:complexType>
     <xs:complexType name="BinaryObjects">
         <xs:sequence>
             <xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"/>
@@ -105,12 +111,6 @@
             <!-- currently no glossary entries are defined -->
         </xs:choice>
     </xs:complexType>
-    <xs:complexType name="QualifiedPartyIdentifier">
-        <xs:sequence>
-            <xs:element name="formatType" type="etsi103120:FormatType"/>
-            <xs:element name="value" type="etsi103280:LongString"/>
-        </xs:sequence>
-    </xs:complexType>
 
     <!-- ************************************************************************************* -->
     <!-- CSP-defined container (Clause 5.6) -->
-- 
GitLab


From e22e6ced53a388030f5ac9ff8938a64b75866af3 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Fri, 13 Oct 2023 14:04:01 +0000
Subject: [PATCH 3/3] adding a format for identifiers

---
 103707/TS_103_707.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index a35f180..9656aec 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -78,7 +78,7 @@
     </xs:simpleType>
     <xs:complexType name="QualifiedPartyIdentifier">
         <xs:sequence>
-            <xs:element name="formatType" type="etsi103120:FormatType"/>
+            <xs:element name="formatType" type="etsi103120:FormatType" minOccurs="0"/>
             <xs:element name="value" type="etsi103280:LongString"/>
         </xs:sequence>
     </xs:complexType>
-- 
GitLab