Commit 9d478480 authored by Vishal Masalawala's avatar Vishal Masalawala
Browse files

removed simplification

parent 7ac6b1ba

103120/schema/xsd/ts_103120_Core.xsd

+0 −15
Original line number Diff line number Diff line
@@ -204,19 +204,4 @@ 
            <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="EndpointID"/>

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

        </xs:choice>

    </xs:complexType>

</xs:schema>

103120/schema/xsd/ts_103120_Destination.xsd

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

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

                <xs:sequence>

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

                    <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"/>
@@ -23,7 +23,7 @@ 
        <xs:complexContent>

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

                <xs:sequence>

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

                    <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"/>
@@ -45,4 +45,19 @@ 
            <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

+1 −3
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ 
            <xs:element name="NationalDeliveryParameters" type="NationalDeliveryParameters" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

<!--    

    <xs:complexType name="DeliveryAddress">

        <xs:choice>

            <xs:element name="IPv4Address" type="etsi:IPv4Address"/>
@@ -92,7 +91,6 @@ 
            <xs:element name="DeliveryInformationID" type="etsi:LongString"/>

        </xs:choice>

    </xs:complexType>

-->

    <xs:complexType name="TaskFlags">

        <xs:sequence>

            <xs:element name="TaskFlag" type="common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>
@@ -170,7 +168,7 @@ 
    </xs:complexType>

    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

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

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