From 7743c8b0782b4b6998e5f17529efac3ed78603d7 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 5 Oct 2023 11:10:05 +0100
Subject: [PATCH 1/4] Alternative mechanism

---
 103707/TS_103_707.xsd                      | 37 +++++--------------
 103707/examples/example_new_identifier.xml | 43 ++++++++++++++++++++++
 testing/xsd_compile_targets.json           | 12 +++++-
 3 files changed, 64 insertions(+), 28 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 b7cc060..6af985a 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -63,17 +63,25 @@
         <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">
         <xs:sequence>
-            <xs:element name="identifier" type="MessagingPartyIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="identifier" type="MessagingPartyIdentifier"/>
+                <xs:element name="qualifiedIdentifier" type="QualifiedMessagingPartyIdentifier"/>
+            </xs:choice>
         </xs:sequence>
     </xs:complexType>
     <xs:simpleType name="MessagingPartyIdentifier">
         <xs:restriction base="etsi103280:LongString"/>
     </xs:simpleType>
+    <xs:complexType name="QualifiedMessagingPartyIdentifier">
+        <xs:sequence>
+            <xs:element name="identifier" type="MessagingPartyIdentifier"/>
+            <xs:element name="typeOfIdentifier" type="etsi103280:LongString" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
     <xs:complexType name="BinaryObjects">
         <xs:sequence>
             <xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"/>
@@ -103,31 +111,6 @@
             <!-- 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) -->
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 fcd11aeb07e2ba73f1b6a073427d1990810e3996 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 5 Oct 2023 11:23:08 +0100
Subject: [PATCH 2/4] Fixing minOccurs

---
 103707/TS_103_707.xsd                      | 2 +-
 103707/examples/example_new_identifier.xml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index 6af985a..e7c0ce0 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -67,7 +67,7 @@
     </xs:complexType>
     <xs:complexType name="MessagingPartyIdentifiers">
         <xs:sequence>
-            <xs:choice maxOccurs="unbounded">
+            <xs:choice minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="identifier" type="MessagingPartyIdentifier"/>
                 <xs:element name="qualifiedIdentifier" type="QualifiedMessagingPartyIdentifier"/>
             </xs:choice>
diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
index d69399c..04e0b2c 100644
--- a/103707/examples/example_new_identifier.xml
+++ b/103707/examples/example_new_identifier.xml
@@ -16,10 +16,6 @@
             <messageReceivers>
                 <recipient>
                     <identifiers>
-                        <qualifiedIdentifier>
-                            <identifier>qualified@example.com</identifier>
-                            <typeOfIdentifier>indication of type</typeOfIdentifier>
-                        </qualifiedIdentifier>
                     </identifiers>
                 </recipient>
             </messageReceivers>
-- 
GitLab


From d24c884e1afa9ff40fdbcb89b8288f2b4149dd1d Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 5 Oct 2023 11:23:23 +0100
Subject: [PATCH 3/4] Fixing example

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

diff --git a/103707/examples/example_new_identifier.xml b/103707/examples/example_new_identifier.xml
index 04e0b2c..d69399c 100644
--- a/103707/examples/example_new_identifier.xml
+++ b/103707/examples/example_new_identifier.xml
@@ -16,6 +16,10 @@
             <messageReceivers>
                 <recipient>
                     <identifiers>
+                        <qualifiedIdentifier>
+                            <identifier>qualified@example.com</identifier>
+                            <typeOfIdentifier>indication of type</typeOfIdentifier>
+                        </qualifiedIdentifier>
                     </identifiers>
                 </recipient>
             </messageReceivers>
-- 
GitLab


From f73887f20818ab15602fdd0ffc1fe5fe1a6c84d0 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Mon, 9 Oct 2023 10:02:23 +0100
Subject: [PATCH 4/4] Updating xsd

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

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index 71c6e2d..c2f7a76 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -69,19 +69,13 @@
         <xs:sequence>
             <xs:choice minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="identifier" type="MessagingPartyIdentifier"/>
-                <xs:element name="qualifiedIdentifier" type="QualifiedMessagingPartyIdentifier"/>
+                <xs:element name="qualifiedIdentifier" type="QualifiedPartyIdentifier"/>
             </xs:choice>
         </xs:sequence>
     </xs:complexType>
     <xs:simpleType name="MessagingPartyIdentifier">
         <xs:restriction base="etsi103280:LongString"/>
     </xs:simpleType>
-    <xs:complexType name="QualifiedMessagingPartyIdentifier">
-        <xs:sequence>
-            <xs:element name="identifier" type="MessagingPartyIdentifier"/>
-            <xs:element name="typeOfIdentifier" type="etsi103280:LongString" minOccurs="0"/>
-        </xs:sequence>
-    </xs:complexType>
     <xs:complexType name="BinaryObjects">
         <xs:sequence>
             <xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"/>
@@ -111,11 +105,10 @@
             <!-- currently no glossary entries are defined -->
         </xs:choice>
     </xs:complexType>
-
-    <xs:complexType name="IdentifierValue">
+    <xs:complexType name="QualifiedPartyIdentifier">
         <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>
 
-- 
GitLab