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

Merge branch 'cr/103707/0011' into 'meeting/LI64' 

TS 103 707 CR0011 – Adding a format for identifiers

See merge request !111
parents e648774f 670619c8

103707/TS_103_707.xsd

+13 −2
Original line number Diff line number Diff line 
<?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: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"/>

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

    <!-- Handover Item definitions including header (clause 5.3) -->

    <!-- ************************************************************************************* -->
@@ -66,12 +67,21 @@ 
    </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">

        <xs:restriction base="etsi103280:LongString"/>

    </xs:simpleType>

    <xs:complexType name="QualifiedPartyIdentifier">

        <xs:sequence>

            <xs:element name="formatType" type="etsi103120:FormatType" minOccurs="0"/>

            <xs:element name="value" type="etsi103280:LongString"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="BinaryObjects">

        <xs:sequence>

            <xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"/>
@@ -101,6 +111,7 @@ 
            <!-- currently no glossary entries are defined -->

        </xs:choice>

    </xs:complexType>



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

    <!-- CSP-defined container (Clause 5.6) -->

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

103707/examples/example_new_identifier.xml

0 → 100644
+49 −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" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task">

    <header/>

    <payload xsi:type="MessagingPayload">

        <coreParameters>

            <messageSender>

                <identifiers>

                    <qualifiedIdentifier>

                        <formatType>

                            <etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>

                            <etsi103120:FormatName>EmailAddress</etsi103120:FormatName>

                        </formatType>

                        <value>qualified@example.com</value>

                    </qualifiedIdentifier>

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

                </identifiers>

                <isTargetedParty>true</isTargetedParty>

            </messageSender>

            <messageReceivers>

                <recipient>

                    <identifiers>

                        <qualifiedIdentifier>

                            <formatType>

                                <etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>

                                <etsi103120:FormatName>EmailAddress</etsi103120:FormatName>

                            </formatType>

                            <value>qualified@example.com</value>

                        </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>

testing/xsd_compile_targets.json

+15 −1
Original line number Diff line number Diff line
@@ -51,5 +51,19 @@ 
        "exampleFiles" : [

            "103120/examples/xml"

        ]

    },

    {

        "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",

            "testing/deps/xmldsig/xmldsig-core-schema.xsd",

            "103707/examples/FooServiceSchema.xsd"

        ],

        "exampleFiles" : [

            "103707/examples"

        ]

    }    

]