Commit 66ac3402 authored by Vishal Masalawala's avatar Vishal Masalawala
Browse files

leverage task inheritance

parent 44769cdc

103120/schema/xsd/ts_103120_Destination.xsd

+4 −42
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:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2019/10/Destination" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Destination" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xlmns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns="http://uri.etsi.org/03120/common/2019/10/Destination" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Destination" elementFormDefault="qualified" attributeFormDefault="unqualified">

    <xs:import namespace="http://uri.etsi.org/03120/common/2020/09/Task"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>

    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -7,14 +8,7 @@ 
        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

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

                    <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

                    <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

                    <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

                    <xs:element name="IRIorCC" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="DeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

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

                    <xs:group ref="task:LIDeliveryDestination"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -23,41 +17,9 @@ 
        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

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

                    <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

                    <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

                    <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

                    <xs:element name="IRIorCC" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

                    <xs:element name="DeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

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

                    <xs:group ref="task:LDDeliveryDestination"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="NationalDeliveryParameters" abstract="true">

        <xs:sequence>

            <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="NationalEncryptionDetails" abstract="true">

        <xs:sequence>

            <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="DeliveryAddress">

        <xs:choice>

            <xs:element name="IPv4Address" type="etsi:IPv4Address"/>

            <xs:element name="IPv6Address" type="etsi:IPv6Address"/>

            <xs:element name="IPAddressPort" type="etsi:IPAddressPort"/>

            <xs:element name="IPAddressPortRange" type="etsi:IPAddressPortRange"/>

            <xs:element name="E164Number" type="etsi:InternationalE164"/>

            <xs:element name="FTPAddress" type="xs:anyURI"/>

            <xs:element name="URL" type="xs:anyURI"/>

            <xs:element name="FQDN" type="etsi:LongString"/>

            <xs:element name="EmailAddress" type="etsi:EmailAddress"/>

            <xs:element name="EndpointID" type="core:EndpointID"/>

            <xs:element name="DeliveryInformationID" type="etsi:LongString"/>

        </xs:choice>

    </xs:complexType>

</xs:schema>
 
 No newline at end of file

103120/schema/xsd/ts_103120_Task.xsd

+25 −15
Original line number Diff line number Diff line
@@ -66,14 +66,7 @@ 
    </xs:complexType>

    <xs:complexType name="DeliveryDestination">

        <xs:sequence>

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

            <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="IRIorCC" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="DeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

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

            <xs:group ref="LIDeliveryDestination"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="DeliveryAddress">
@@ -168,13 +161,7 @@ 
    </xs:complexType>

    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

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

            <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="LDHandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="LDDeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

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

            <xs:group ref="LDDeliveryDestination"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="LDTaskFlags">
@@ -331,4 +318,27 @@ 
            <xs:element name="TransmissionTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:group name="LDDeliveryDestination">

        <xs:sequence>

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

            <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="LDHandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="LDDeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

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

        </xs:sequence>

    </xs:group>

    <xs:group name="LIDeliveryDestination">

        <xs:sequence>

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

            <xs:element name="DestinationReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="IRIorCC" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="DeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

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

        </xs:sequence>

    </xs:group>

</xs:schema>
 
 No newline at end of file