Commit 9659f877 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

New fields and examples

parent 3657cb3f

103707/TS_103_707.xsd

+67 −3
Original line number Diff line number Diff line
@@ -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">
@@ -95,6 +107,46 @@ 
    <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) -->

103707/examples/example_generic.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?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

testing/xsd_compile_targets.json

+10 −0
Original line number Diff line number Diff line
@@ -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