Commit 8c24c972 authored by Vishal Masalawala's avatar Vishal Masalawala Committed by Mark Canterbury
Browse files

Given difference between checksums in 707 and 120 decided to remove use of group

parent e37726f4

103120/schema/xsd/ts_103120_Common.xsd

+1 −14
Original line number Diff line number Diff line
@@ -101,19 +101,6 @@ 
            <xs:element name="EndTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:group name="URLObjectGroup">

        <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="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="ChecksumType" minOccurs="0"/>

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

        </xs:sequence>

    </xs:group>

    <xs:complexType name="ListOfChecksumAndType">

        <xs:sequence>

            <xs:element name="ChecksumAndType" type="ChecksumAndType" maxOccurs="unbounded"/>
@@ -126,7 +113,7 @@ 
        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="Checksum">

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

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

    </xs:simpleType>

    <xs:simpleType name="ChecksumType">

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

103120/schema/xsd/ts_103120_Delivery.xsd

+9 −1
Original line number Diff line number Diff line
@@ -78,7 +78,15 @@ 
    </xs:complexType>

    <xs:complexType name="URLObject">

        <xs:sequence>

            <xs:group ref="common:URLObjectGroup"/>

            <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