Commit e6cf09de authored by Vishal Masalawala's avatar Vishal Masalawala
Browse files

Redeclaration of BinaryObject in a group to remove reference to 707. In... 

Redeclaration of BinaryObject in a group to remove reference to 707. In preparaation for future reference from 707
parent e469483d

103120/schema/xsd/ts_103120_Common.xsd

+11 −0
Original line number Diff line number Diff line
@@ -76,4 +76,15 @@ 
            <xs:element name="EndTime" type="etsi:QualifiedDateTime"/>

        </xs:sequence>

    </xs:complexType>

    <xs:group name="BinaryObjectGroup">

        <xs:sequence>

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

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

            <xs:element name="contentType" type="etsi103280:LongString" minOccurs="0"/>

            <xs:element name="expiry" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>

            <xs:element name="checksum" type="etsi103280:LongString" minOccurs="0"/>

            <xs:element name="originalFilename" type="etsi103280:LongString" minOccurs="0"/>

            <xs:element name="cspDefinedIdentifier" type="etsi103280:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:group>

</xs:schema>

103120/schema/xsd/ts_103120_Delivery.xsd

+7 −3
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:etsi707="http://uri.etsi.org/03707/2020/02" 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/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" 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" xmlns="http://uri.etsi.org/03120/common/2019/10/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" elementFormDefault="qualified" attributeFormDefault="unqualified">

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

    <xs:import namespace="http://uri.etsi.org/03707/2020/02"/>

    <xs:complexType name="DeliveryObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">
@@ -55,7 +54,7 @@ 
            <xs:element name="BinaryData" type="EmbeddedBinaryData"/>

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

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

            <xs:element name="URLData" type="etsi707:BinaryObject"/>

            <xs:element name="URLData" type="BinaryObject"/>

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="EmbeddedBinaryData">
@@ -76,4 +75,9 @@ 
            <xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="BinaryObject">

        <xs:sequence>

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

        </xs:sequence>

    </xs:complexType>

</xs:schema>