From 74e0797c563ea3183bf38b30afab9e80de8622dc Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Wed, 4 Oct 2023 16:52:57 +0000
Subject: [PATCH 01/11] Adding a format for identifiers

---
 103707/TS_103_707.xsd | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index 591007e..f290214 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="http://uri.etsi.org/03707/2020/02" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task" 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) -->
     <!-- ************************************************************************************* -->
@@ -101,6 +102,32 @@
             <!-- currently no glossary entries are defined -->
         </xs:choice>
     </xs:complexType>
+    
+    <xs:complexType name="Identifiers">
+        <xs:sequence>
+            <xs:element name="identifier" type="Identifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="Identifier">
+        <xs:sequence>
+            <xs:element name="IdentifierValues" type="IdentifierValues" />
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="IdentifierValues">
+        <xs:sequence>
+            <xs:element name="IdentifierValue" type="IdentifierValue" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="IdentifierValue">
+        <xs:sequence>
+            <xs:element name="FormatType" type="etsi103120:FormatType"/>
+            <xs:element name="Value" type="etsi:LongString"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <!-- ************************************************************************************* -->
     <!-- CSP-defined container (Clause 5.6) -->
     <!-- ************************************************************************************* -->
-- 
GitLab


From 6021404be91da63d0ca1afbbf6c24c9f8a49cf7c Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Wed, 4 Oct 2023 17:07:34 +0000
Subject: [PATCH 02/11] Adding a format for identifiers

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

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index f290214..b7cc060 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -63,6 +63,7 @@
         <xs:sequence>
             <xs:element name="identifiers" type="MessagingPartyIdentifiers"/>
             <xs:element name="isTargetedParty" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="partyIdentifiers" type="Identifiers" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="MessagingPartyIdentifiers">
-- 
GitLab


From 06edc64ec2a2114aac9ccababcdfbff924b32c94 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 07:18:25 +0000
Subject: [PATCH 03/11] Adding a format type for identifiers

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

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index b7cc060..9c7a455 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -63,7 +63,7 @@
         <xs:sequence>
             <xs:element name="identifiers" type="MessagingPartyIdentifiers"/>
             <xs:element name="isTargetedParty" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="partyIdentifiers" type="Identifiers" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="partyIdentifiers" type="Identifiers" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="MessagingPartyIdentifiers">
@@ -125,7 +125,7 @@
     <xs:complexType name="IdentifierValue">
         <xs:sequence>
             <xs:element name="FormatType" type="etsi103120:FormatType"/>
-            <xs:element name="Value" type="etsi:LongString"/>
+            <xs:element name="Value" type="etsi103280:LongString"/>
         </xs:sequence>
     </xs:complexType>
 
-- 
GitLab


From 16b1eff12010cbcffc3ab72e4ad5c9e37f39cca6 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Mon, 9 Oct 2023 09:03:46 +0000
Subject: [PATCH 04/11] Alternative mechanism?

---
 103707/TS_103_707.xsd                      | 31 ++++------------
 103707/examples/example_new_identifier.xml | 43 ++++++++++++++++++++++
 testing/xsd_compile_targets.json           | 12 +++++-
 3 files changed, 61 insertions(+), 25 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 9c7a455..c2f7a76 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -63,12 +63,14 @@
         <xs:sequence>
             <xs:element name="identifiers" type="MessagingPartyIdentifiers"/>
             <xs:element name="isTargetedParty" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="partyIdentifiers" type="Identifiers" minOccurs="0"/>
         </xs:sequence>
     </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">
@@ -103,29 +105,10 @@
             <!-- currently no glossary entries are defined -->
         </xs:choice>
     </xs:complexType>
-    
-    <xs:complexType name="Identifiers">
+    <xs:complexType name="QualifiedPartyIdentifier">
         <xs:sequence>
-            <xs:element name="identifier" type="Identifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="Identifier">
-        <xs:sequence>
-            <xs:element name="IdentifierValues" type="IdentifierValues" />
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="IdentifierValues">
-        <xs:sequence>
-            <xs:element name="IdentifierValue" type="IdentifierValue" minOccurs="1" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="IdentifierValue">
-        <xs:sequence>
-            <xs:element name="FormatType" type="etsi103120:FormatType"/>
-            <xs:element name="Value" type="etsi103280:LongString"/>
+            <xs:element name="formatType" type="etsi103120:FormatType"/>
+            <xs:element name="value" type="etsi103280:LongString"/>
         </xs:sequence>
     </xs:complexType>
 
diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
new file mode 100644
index 0000000..d69399c
--- /dev/null
+++ b/103707/examples/example_new_identifier.xml
@@ -0,0 +1,43 @@
+<?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">
+    <header/>
+    <payload xsi:type="MessagingPayload">
+        <coreParameters>
+            <messageSender>
+                <identifiers>
+                    <qualifiedIdentifier>
+                        <identifier>qualified@example.com</identifier>
+                        <typeOfIdentifier>indication of type</typeOfIdentifier>
+                    </qualifiedIdentifier>
+                    <identifier>old_style_unqualified@example.com</identifier>
+                </identifiers>
+                <isTargetedParty>true</isTargetedParty>
+            </messageSender>
+            <messageReceivers>
+                <recipient>
+                    <identifiers>
+                        <qualifiedIdentifier>
+                            <identifier>qualified@example.com</identifier>
+                            <typeOfIdentifier>indication of type</typeOfIdentifier>
+                        </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..35567b4 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -51,5 +51,15 @@
         "exampleFiles" : [
             "103120/examples/xml"
         ]
-    }
+    },
+    {
+        "coreSchema" : "103707/TS_103_707.xsd",
+        "supportingSchemas" : [
+            "103280/TS_103_280.xsd",
+            "103707/examples/FooServiceSchema.xsd"
+        ],
+        "exampleFiles" : [
+            "103707/examples"
+        ]
+    }    
 ]
-- 
GitLab


From 7238dfa8863740a36d0cdaa9edaba64910871129 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 13:33:31 +0000
Subject: [PATCH 05/11] Adding a format for identifiers

---
 103707/examples/example_new_identifier.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
index d69399c..8011291 100644
--- a/103707/examples/example_new_identifier.xml
+++ b/103707/examples/example_new_identifier.xml
@@ -6,8 +6,8 @@
             <messageSender>
                 <identifiers>
                     <qualifiedIdentifier>
-                        <identifier>qualified@example.com</identifier>
-                        <typeOfIdentifier>indication of type</typeOfIdentifier>
+                        <formatType>EmailAddress</formatType>
+                        <value>qualified@example.com</value>
                     </qualifiedIdentifier>
                     <identifier>old_style_unqualified@example.com</identifier>
                 </identifiers>
@@ -17,8 +17,8 @@
                 <recipient>
                     <identifiers>
                         <qualifiedIdentifier>
-                            <identifier>qualified@example.com</identifier>
-                            <typeOfIdentifier>indication of type</typeOfIdentifier>
+                            <formatType>EmailAddress</formatType>
+                            <value>qualified@example.com</value>
                         </qualifiedIdentifier>
                     </identifiers>
                 </recipient>
-- 
GitLab


From f4c11846743856f2eb8fd2decd9bed1c75e7f460 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 13:46:09 +0000
Subject: [PATCH 06/11] Adding a format for identifiers

---
 103707/TS_103_707.xsd                      |  2 +-
 103707/examples/example_new_identifier.xml | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index c2f7a76..e7907c2 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -1,5 +1,5 @@
 <?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" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task" 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"/>
     <!-- ************************************************************************************* -->
diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
index 8011291..5268899 100644
--- a/103707/examples/example_new_identifier.xml
+++ b/103707/examples/example_new_identifier.xml
@@ -6,7 +6,10 @@
             <messageSender>
                 <identifiers>
                     <qualifiedIdentifier>
-                        <formatType>EmailAddress</formatType>
+                        <formatType>
+                            <FormatOwner>ETSI</FormatOwner>
+                            <FormatName>EmailAddress</task:FormatName>
+                        </formatType>
                         <value>qualified@example.com</value>
                     </qualifiedIdentifier>
                     <identifier>old_style_unqualified@example.com</identifier>
@@ -17,7 +20,10 @@
                 <recipient>
                     <identifiers>
                         <qualifiedIdentifier>
-                            <formatType>EmailAddress</formatType>
+                            <formatType>
+                                <FormatOwner>ETSI</FormatOwner>
+                                <FormatName>EmailAddress</task:FormatName>
+                            </formatType>
                             <value>qualified@example.com</value>
                         </qualifiedIdentifier>
                     </identifiers>
-- 
GitLab


From 5144dad36e632c0427c8c8aad18703abcd4dbc93 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 14:07:50 +0000
Subject: [PATCH 07/11] Adding a format for idantifiers

---
 testing/xsd_compile_targets.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index 35567b4..c42295c 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -56,6 +56,7 @@
         "coreSchema" : "103707/TS_103_707.xsd",
         "supportingSchemas" : [
             "103280/TS_103_280.xsd",
+            "103120/schema/xsd/ts_103120_Task.xsd",
             "103707/examples/FooServiceSchema.xsd"
         ],
         "exampleFiles" : [
-- 
GitLab


From fff4dd4c73fcfbcbae482e7e514f7968ef449c5e Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 14:17:17 +0000
Subject: [PATCH 08/11] Adding a format for identifiers

---
 testing/xsd_compile_targets.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index c42295c..dede9bf 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -56,6 +56,8 @@
         "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",
             "103707/examples/FooServiceSchema.xsd"
         ],
-- 
GitLab


From 7950b85af574b51ac0ec3db9cfe09980ec4b1e4a Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 14:20:12 +0000
Subject: [PATCH 09/11] Adding a format for identifiers

---
 testing/xsd_compile_targets.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index dede9bf..bb4f13e 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -59,6 +59,7 @@
             "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" : [
-- 
GitLab


From 5f66c648da4eaafb5c490fdaf3940d2209ad4333 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 14:22:20 +0000
Subject: [PATCH 10/11] Adding a format for identifiers

---
 103707/examples/example_new_identifier.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
index 5268899..a26ef7a 100644
--- a/103707/examples/example_new_identifier.xml
+++ b/103707/examples/example_new_identifier.xml
@@ -8,7 +8,7 @@
                     <qualifiedIdentifier>
                         <formatType>
                             <FormatOwner>ETSI</FormatOwner>
-                            <FormatName>EmailAddress</task:FormatName>
+                            <FormatName>EmailAddress</FormatName>
                         </formatType>
                         <value>qualified@example.com</value>
                     </qualifiedIdentifier>
@@ -22,7 +22,7 @@
                         <qualifiedIdentifier>
                             <formatType>
                                 <FormatOwner>ETSI</FormatOwner>
-                                <FormatName>EmailAddress</task:FormatName>
+                                <FormatName>EmailAddress</FormatName>
                             </formatType>
                             <value>qualified@example.com</value>
                         </qualifiedIdentifier>
-- 
GitLab


From 51022545199a7f3ac392c059f74a6de3373e0f05 Mon Sep 17 00:00:00 2001
From: wernersa <1040-wernersa@users.noreply.forge.etsi.org>
Date: Mon, 9 Oct 2023 14:57:34 +0000
Subject: [PATCH 11/11] Adding a format for identifiers

---
 103707/examples/example_new_identifier.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
index a26ef7a..7477baa 100644
--- a/103707/examples/example_new_identifier.xml
+++ b/103707/examples/example_new_identifier.xml
@@ -1,5 +1,5 @@
 <?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">
+<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>
@@ -7,8 +7,8 @@
                 <identifiers>
                     <qualifiedIdentifier>
                         <formatType>
-                            <FormatOwner>ETSI</FormatOwner>
-                            <FormatName>EmailAddress</FormatName>
+                            <etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>
+                            <etsi103120:FormatName>EmailAddress</etsi103120:FormatName>
                         </formatType>
                         <value>qualified@example.com</value>
                     </qualifiedIdentifier>
@@ -21,8 +21,8 @@
                     <identifiers>
                         <qualifiedIdentifier>
                             <formatType>
-                                <FormatOwner>ETSI</FormatOwner>
-                                <FormatName>EmailAddress</FormatName>
+                                <etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>
+                                <etsi103120:FormatName>EmailAddress</etsi103120:FormatName>
                             </formatType>
                             <value>qualified@example.com</value>
                         </qualifiedIdentifier>
-- 
GitLab