Commit cf6a40bd authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 103 707 v1.3.1

parent 5b86d671

103707/TS_103_707.xsd

+9 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"

           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"

           xmlns="http://uri.etsi.org/03707/2020/02"

           xmlns="http://uri.etsi.org/03707/2020/02"

           targetNamespace="http://uri.etsi.org/03707/2020/02"

           targetNamespace="http://uri.etsi.org/03707/2020/02"

           version="1.1.1"

           version="1.3.1"

           elementFormDefault="qualified">

           elementFormDefault="qualified">





  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -13,6 +13,7 @@ 
  <!-- ************************************************************************************* -->

  <!-- ************************************************************************************* -->





  <xs:element name="handoverItem" type="HandoverItem"></xs:element>

  <xs:element name="handoverItem" type="HandoverItem"></xs:element>

  <xs:element name="handoverItemCollection" type="HandoverItemCollection"></xs:element>





  <xs:complexType name="HandoverItem">

  <xs:complexType name="HandoverItem">

    <xs:sequence>

    <xs:sequence>
@@ -21,6 +22,12 @@ 
    </xs:sequence>

    </xs:sequence>

  </xs:complexType>

  </xs:complexType>

  

  

  <xs:complexType name="HandoverItemCollection">

    <xs:sequence>

      <xs:element name="handoverItem" maxOccurs="unbounded"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="Header">

  <xs:complexType name="Header">

    <xs:sequence>

    <xs:sequence>

      <xs:element name="applicationCorrelation" type="ApplicationCorrelation" minOccurs="0"></xs:element>

      <xs:element name="applicationCorrelation" type="ApplicationCorrelation" minOccurs="0"></xs:element>

103707/portal/TS_103_707_v010201.xsd→103707/portal/TS_103_707_v010301.xsd

+9 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"

           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"

           xmlns="http://uri.etsi.org/03707/2020/02"

           xmlns="http://uri.etsi.org/03707/2020/02"

           targetNamespace="http://uri.etsi.org/03707/2020/02"

           targetNamespace="http://uri.etsi.org/03707/2020/02"

           version="1.1.1"

           version="1.3.1"

           elementFormDefault="qualified">

           elementFormDefault="qualified">





  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -13,6 +13,7 @@ 
  <!-- ************************************************************************************* -->

  <!-- ************************************************************************************* -->





  <xs:element name="handoverItem" type="HandoverItem"></xs:element>

  <xs:element name="handoverItem" type="HandoverItem"></xs:element>

  <xs:element name="handoverItemCollection" type="HandoverItemCollection"></xs:element>





  <xs:complexType name="HandoverItem">

  <xs:complexType name="HandoverItem">

    <xs:sequence>

    <xs:sequence>
@@ -21,6 +22,12 @@ 
    </xs:sequence>

    </xs:sequence>

  </xs:complexType>

  </xs:complexType>

  

  

  <xs:complexType name="HandoverItemCollection">

    <xs:sequence>

      <xs:element name="handoverItem" maxOccurs="unbounded"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="Header">

  <xs:complexType name="Header">

    <xs:sequence>

    <xs:sequence>

      <xs:element name="applicationCorrelation" type="ApplicationCorrelation" minOccurs="0"></xs:element>

      <xs:element name="applicationCorrelation" type="ApplicationCorrelation" minOccurs="0"></xs:element>

103707/portal/examples/example_multiple_items.xml

0 → 100644
+75 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<handoverItemCollection  xmlns="http://uri.etsi.org/03707/2020/02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <handoverItem>

    <header></header>

    <payload xsi:type="MessagingPayload">

      <coreParameters>

        <messageSender>

          <identifiers>

            <identifier>target@example.com</identifier>

          </identifiers>

          <isTargetedParty>true</isTargetedParty>

        </messageSender>

        <messageReceivers>

          <recipient>

            <identifiers>

              <identifier>someoneelse@example.com</identifier>

            </identifiers>

          </recipient>

        </messageReceivers>

        <timestamp>2021-06-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>

  <handoverItem>

    <header></header>

    <payload xsi:type="MessagingPayload">

      <coreParameters>

        <messageSender>

          <identifiers>

              <identifier>someoneelse@example.com</identifier>

          </identifiers>

        </messageSender>

        <messageReceivers>

          <recipient>

            <identifiers>

              <identifier>target@example.com</identifier>

            </identifiers>

            <isTargetedParty>true</isTargetedParty>

          </recipient>

        </messageReceivers>

        <timestamp>2021-06-18T06: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>

</handoverItemCollection>

103707/portal/testing/validate_examples.py

+3 −2
Original line number Original line Diff line number Diff line 
import glob

import glob

import sys

import sys

import argparse

from pathlib import Path

from pathlib import Path

from pprint import pprint

from pprint import pprint
@@ -21,7 +22,7 @@ if __name__ == '__main__': 




    extraSchemas = [

    extraSchemas = [

        'examples/FooServiceSchema.xsd',

        'examples/FooServiceSchema.xsd',

        'TS_103_280_v020301.xsd'

        'TS_103_280_v020401.xsd'

    ]

    ]





    locations = []

    locations = []
@@ -29,7 +30,7 @@ if __name__ == '__main__': 
        xs = xmlschema.XMLSchema(schemaFile, validation='skip')

        xs = xmlschema.XMLSchema(schemaFile, validation='skip')

        locations.append((xs.default_namespace, str(Path(schemaFile))))

        locations.append((xs.default_namespace, str(Path(schemaFile))))





    coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations)

    coreSchema = xmlschema.XMLSchema('TS_103_707_v010301.xsd', locations=locations)





    for schema in extraSchemas:

    for schema in extraSchemas:

        newSchema = xmlschema.XMLSchema(schema)

        newSchema = xmlschema.XMLSchema(schema)