Commit 03484cad authored by Vishal Masalawala's avatar Vishal Masalawala
Browse files

Update 4 files 

- /103120/schema/xsd/ts_103120_Core.xsd
- /103120/schema/xsd/ts_103120_Common.xsd
- /103120/schema/xsd/ts_103120_Destination.xsd
- /103120/schema/xsd/ts_103120_Task.xsd
parent a208a275

103120/schema/xsd/ts_103120_Common.xsd

+0 −10
Original line number Diff line number Diff line
@@ -118,14 +118,4 @@ 
    <xs:simpleType name="ChecksumType">

        <xs:restriction base="etsi:ShortString"/>

    </xs:simpleType>

    <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:schema>

103120/schema/xsd/ts_103120_Core.xsd

+0 −38
Original line number Diff line number Diff line
@@ -204,42 +204,4 @@ 
            <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>

        </xs:sequence>

    </xs:complexType>

    <xs:group name="LIDestinationDetails">

        <xs:sequence>

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

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

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

            <xs:element name="EncryptionReference" type="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="common:NationalDeliveryParameters" minOccurs="0"/>

        </xs:sequence>

    </xs:group>

    <xs:group name="LDDestinationDetails">

        <xs:sequence>

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

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

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

            <xs:element name="EncryptionDetails" type="common: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="common:NationalDeliveryParameters" minOccurs="0"/>

        </xs:sequence>

    </xs:group>

    <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="EndpointID"/>

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

        </xs:choice>

    </xs:complexType>

</xs:schema>

103120/schema/xsd/ts_103120_Destination.xsd

+50 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
        <xs:complexContent>

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

                <xs:sequence>

                    <xs:group ref="core:LIDestinationDetails"/>

                    <xs:group ref="LIDestinationDetails"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -16,9 +16,57 @@ 
        <xs:complexContent>

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

                <xs:sequence>

                    <xs:group ref="core:LDDestinationDetails"/>

                    <xs:group ref="LDDestinationDetails"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:group name="LIDestinationDetails">

        <xs:sequence>

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

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

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

            <xs:element name="EncryptionReference" type="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:sequence>

    </xs:group>

    <xs:group name="LDDestinationDetails">

        <xs:sequence>

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

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

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

            <xs:element name="EncryptionDetails" type="common: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: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: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:schema>

103120/schema/xsd/ts_103120_Task.xsd

+40 −4
Original line number Diff line number Diff line
@@ -66,8 +66,14 @@ 
    </xs:complexType>

    <xs:complexType name="DeliveryDestination">

        <xs:sequence>

            <xs:group ref="core:LIDestinationDetails"/>

        </xs:sequence>

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

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

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

            <xs:element name="EncryptionReference" type="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:sequence>

    </xs:complexType>

    <xs:complexType name="TaskFlags">

        <xs:sequence>
@@ -136,8 +142,13 @@ 
    </xs:complexType>

    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

            <xs:group ref="core:LDDestinationDetails"/>

        </xs:sequence>

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

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

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

            <xs:element name="EncryptionDetails" type="common: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:complexType>

    <xs:complexType name="LDTaskFlags">

        <xs:sequence>
@@ -293,4 +304,29 @@ 
            <xs:element name="TransmissionTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

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