From 9659f877fa34eadc48bd6af2f609febe1c298761 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Wed, 29 Jun 2022 17:00:09 +0100
Subject: [PATCH 1/2] New fields and examples

---
 103707/TS_103_707.xsd               | 70 +++++++++++++++++++++++++++--
 103707/examples/example_generic.xml | 37 +++++++++++++++
 testing/xsd_compile_targets.json    | 10 +++++
 3 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 103707/examples/example_generic.xml

diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd
index f9e6da1..d191286 100644
--- a/103707/TS_103_707.xsd
+++ b/103707/TS_103_707.xsd
@@ -58,9 +58,21 @@
   </xs:complexType>
 
 
-  
+  <xs:complexType name="GenericPayload" abstract="false">
+    <xs:complexContent>
+      <xs:extension base="Payload">
+        <xs:sequence>
+          <xs:element name="coreParameters" type="GenericCoreParameters"></xs:element>
+          <xs:element name="additionalParameters" type="GenericAdditionalParameters" minOccurs="0"></xs:element>
+          <xs:element name="cspDefinedParameters" type="CSPDefinedParameters" minOccurs="0"></xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+
   <!-- ************************************************************************************* -->
-  <!-- Core parameters (Clause 5.4) -->
+  <!-- Messaging Core parameters (Clause 5.4) -->
   <!-- ************************************************************************************* -->
   
   <xs:complexType name="MessagingCoreParameters">
@@ -94,7 +106,47 @@
   <xs:simpleType name="MessagingPartyIdentifier">
     <xs:restriction base="etsi103280:LongString"></xs:restriction>
   </xs:simpleType>
-  
+
+  <!-- ************************************************************************************* -->
+  <!-- Generic Core parameters (Clause 5.4) -->
+  <!-- ************************************************************************************* -->
+
+  <xs:complexType name="GenericCoreParameters">
+    <xs:sequence>
+      <xs:element name="sender" type="GenericParty" minOccurs="0"></xs:element>
+      <xs:element name="receivers" type="GenericRecipientList" minOccurs="0"></xs:element>
+      <xs:element name="timestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
+      <xs:element name="associatedBinaryData" type="BinaryObjects" minOccurs="0"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="GenericParty">
+    <xs:sequence>
+      <xs:element name="identifiers" type="GenericPartyIdentifiers"></xs:element>
+      <xs:element name="isTargetedParty" type="xs:boolean" minOccurs="0"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="GenericPartyIdentifiers">
+    <xs:sequence>
+      <xs:element name="identifier" type="GenericPartyIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="GenericPartyIdentifier">
+    <xs:restriction base="etsi103280:LongString"></xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="GenericRecipientList">
+    <xs:sequence>
+      <xs:element name="recipient" type="MessagingParty" minOccurs="1" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <!-- ************************************************************************************* -->
+  <!-- Binary Objects (Clause 5.4.3) -->
+  <!-- ************************************************************************************* -->
+
   <xs:complexType name="BinaryObjects">
     <xs:sequence>
       <xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"></xs:element>
@@ -132,6 +184,18 @@
   </xs:complexType>
 
 
+  <xs:complexType name="GenericAdditionalParameters">
+    <xs:sequence>
+      <xs:element name="additionalParameter" type="GenericAdditionalParameter" minOccurs="1" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="GenericAdditionalParameter">
+    <xs:choice minOccurs="0">
+      <!-- currently no glossary entries are defined -->
+    </xs:choice>
+  </xs:complexType>
+
 
   <!-- ************************************************************************************* -->
   <!-- CSP-defined container (Clause 5.6) -->
diff --git a/103707/examples/example_generic.xml b/103707/examples/example_generic.xml
new file mode 100644
index 0000000..0e76a9d
--- /dev/null
+++ b/103707/examples/example_generic.xml
@@ -0,0 +1,37 @@
+<?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></header>
+  <payload xsi:type="GenericPayload">
+    <coreParameters>
+      <sender>
+        <identifiers>
+          <identifier>target@example.com</identifier>
+        </identifiers>
+        <isTargetedParty>true</isTargetedParty>
+      </sender>
+      <receivers>
+        <recipient>
+          <identifiers>
+            <identifier>someoneelse@example.com</identifier>
+          </identifiers>
+        </recipient>
+      </receivers>
+      <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>
\ No newline at end of file
diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json
index 69ad1b5..5607692 100644
--- a/testing/xsd_compile_targets.json
+++ b/testing/xsd_compile_targets.json
@@ -45,5 +45,15 @@
         "exampleFiles" : [
             "103120/examples"
         ]
+    },
+    {
+        "coreSchema" : "103707/TS_103_707.xsd",
+        "supportingSchemas" : [
+            "103280/TS_103_280.xsd",
+            "103707/examples/FooServiceSchema.xsd"
+        ],
+        "exampleFiles" : [
+            "103707/examples"
+        ]
     }
 ]
\ No newline at end of file
-- 
GitLab


From 17542de8d648adba8a53e884d73f3d6c4a36786c Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Wed, 29 Jun 2022 17:01:36 +0100
Subject: [PATCH 2/2] Extended example

---
 103707/examples/example_generic_extended.xml | 69 ++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 103707/examples/example_generic_extended.xml

diff --git a/103707/examples/example_generic_extended.xml b/103707/examples/example_generic_extended.xml
new file mode 100644
index 0000000..e3a4ad1
--- /dev/null
+++ b/103707/examples/example_generic_extended.xml
@@ -0,0 +1,69 @@
+<?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>
+    <applicationCorrelation>
+      <applicationLevelID>123</applicationLevelID>
+      <applicationSequenceNumber>456</applicationSequenceNumber>
+    </applicationCorrelation>
+  </header>
+  <payload xsi:type="GenericPayload">
+    <coreParameters>
+      <sender>
+        <identifiers>
+          <identifier>someone@example.com</identifier>
+        </identifiers>
+      </sender>
+      <receivers>
+        <recipient>
+          <identifiers>
+            <identifier>someone-else-alias1@example.com</identifier>
+            <identifier>someone-else-alias2@example.com</identifier>
+            <identifier>someone-else-alias3@example.com</identifier>
+          </identifiers>
+        </recipient>
+        <recipient>
+          <identifiers>
+            <identifier>target@example.com</identifier>
+          </identifiers>
+          <isTargetedParty>true</isTargetedParty>
+        </recipient>
+      </receivers>
+      <timestamp>2019-10-17T06:42:23.000000+01:00</timestamp>
+    </coreParameters>
+    <cspDefinedParameters>
+      <cspDefinedMetadata>
+        <schemaDetails>
+          <schemaIdentifier>http://FooServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>
+          <schemaContent>
+            <schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://FooServiceSchema.example.com/schema/v1.1.1/">
+              <xs:element name="fooServiceDefinedParameters" type="FooServiceDefinedParameters"></xs:element>
+              <xs:complexType name="FooServiceDefinedParameters">
+                <xs:sequence>
+                  <xs:element name="item1" type="ItemType"></xs:element>
+                  <xs:element name="item2" type="ItemType"></xs:element>
+                  <xs:element name="item3" type="ItemType"></xs:element>
+                </xs:sequence>
+              </xs:complexType>
+              <xs:simpleType name="ItemType">
+                <xs:restriction base="xs:string">
+                  <xs:enumeration value="Foo"></xs:enumeration>
+                  <xs:enumeration value="Bar"></xs:enumeration>
+                  <xs:enumeration value="Baz"></xs:enumeration>
+                </xs:restriction>
+              </xs:simpleType>
+            </schema>
+          </schemaContent>
+        </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>
\ No newline at end of file
-- 
GitLab