Commit 687ead9e authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/103120/089' into 'meeting/LI68' 

Cr/103120/089 - Additional delivery handover scheme

See merge request !204
parents 7a0284a9 8c24c972

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+50 −0
Original line number Diff line number Diff line
@@ -804,4 +804,54 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!--DeliveryStatus: see Clause 10.2.4 Table 10.X -->

        <Owner>ETSI</Owner>

        <Name>DeliveryStatus</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>Available</Value>

                <Meaning>The Delivery object is available</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Acknowledged</Value>

                <Meaning>The Delivery object details have been acknowledged</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Expired</Value>

                <Meaning>The data related to the Delivery is no longer available due to expiry</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Error</Value>

                <Meaning>The Delivery object or underlying data has an error</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Received</Value>

                <Meaning>The data related to the Delivery object has been received</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!--DeliveryStatus: see Clause 10.2.4 Table 10.Y -->

        <Owner>ETSI</Owner>

        <Name>DeliveryDesiredStatus</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>Available</Value>

                <Meaning>The Delivery object is available</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Acknowledged</Value>

                <Meaning>The Delivery object details have been acknowledged</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Error</Value>

                <Meaning>The Delivery object or underlying data had an error whilst handling</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Received</Value>

                <Meaning>The data related to the Delivery object has been received</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>   

</Dictionaries>

103120/schema/xsd/ts_103120_Common.xsd

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

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="Timespan">

        <xs:sequence>

            <xs:element name="StartTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="EndTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ListOfChecksumAndType">

        <xs:sequence>

            <xs:element name="ChecksumAndType" type="ChecksumAndType" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ChecksumAndType">

        <xs:sequence>

            <xs:element name="Checksum" type="Checksum"/>

            <xs:element name="ChecksumType" type="ChecksumType"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="Checksum">

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

    </xs:simpleType>

    <xs:simpleType name="ChecksumType">

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

    </xs:simpleType>

</xs:schema>

103120/schema/xsd/ts_103120_Core.xsd

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ 
        <xs:sequence>

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

            <xs:element name="LastChanged" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="LastChangedTimespan" type="common:Timespan" minOccurs="0"/>

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

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

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="LISTResponse">

103120/schema/xsd/ts_103120_Delivery.xsd

+19 −20
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
                    <xs:element name="LastSequence" type="xs:boolean" minOccurs="0"/>

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

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

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -52,26 +54,16 @@ 
            <xs:element name="BinaryData" type="EmbeddedBinaryData"/>

            <xs:element name="XMLData" type="EmbeddedXMLData"/>

            <xs:element name="JSONData" type="EmbeddedJSONData"/>

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

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="EmbeddedBinaryData">

        <xs:sequence>

            <xs:element name="Data" type="xs:base64Binary"/>

            <xs:element name="ContentType" type="etsi:ShortString" minOccurs="0"/>

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

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

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

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ListOfChecksumAndType">

        <xs:sequence>

            <xs:element name="ChecksumAndType" type="ChecksumAndType" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ChecksumAndType">

        <xs:sequence>

            <xs:element name="Checksum" type="Checksum"/>

            <xs:element name="ChecksumType" type="ChecksumType"/>

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

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

            <xs:element name="Checksums" type="common:ListOfChecksumAndType" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="EmbeddedXMLData">
@@ -84,10 +76,17 @@ 
            <xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="Checksum">

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

    </xs:simpleType>

    <xs:simpleType name="ChecksumType">

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

    </xs:simpleType>

    <xs:complexType name="URLObject">

        <xs:sequence>

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

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

            <xs:element name="ContentType" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="Expiry" type="etsi:QualifiedMicrosecondDateTime" minOccurs="0"/>

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

            <xs:element name="OriginalFilename" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="CSPDefinedIdentifier" type="etsi:LongString" minOccurs="0"/>

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

            <xs:element name="Checksums" type="common:ListOfChecksumAndType" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

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