Commit 89b49cb2 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102657/0149' into 'meeting/LI68' 

TS 102 657 CR 149 - Correction of the ASN.1 and XML definitions of DigitalTokenIdentifierUpdate 2 files

See merge request !205
parents 1ec4f541 07dd8e6e

102657/RDMessage.asn

+20 −12
Original line number Diff line number Diff line
@@ -2455,29 +2455,37 @@ EdgeComputingApplicationBillingRecords ::= SEQUENCE 


DigitalTokenIdentifier ::= SEQUENCE

{

    baseRecord                  [1] BaseRecord,

    forkRecord                  [2] ForkRecord,

    informativeDataElements     [3] InformativeDataElements,

    baseRecord                  [1] BaseRecord OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    forkRecord                  [2] ForkRecord OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    informativeDataElements     [3] InformativeDataElements OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    ...

}



BaseRecord ::= OCTET STRING



ForkRecord ::= OCTET STRING



InformativeDataElements ::= SEQUENCE

{

    digitalTokenName                        [1] DigitalTokenName,

    tokenIdentifierType                     [2] TokenIdentifierType,

    dTIRegistrationAuthorityIdentifier      [3] DTIRegistrationAuthorityIdentifier,

    otherDataElements                       [4] OtherDataElements,

    digitalTokenName                        [1] DigitalTokenName OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    tokenIdentifierType                     [2] TokenIdentifierType OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    dTIRegistrationAuthorityIdentifier      [3] DTIRegistrationAuthorityIdentifier OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    otherDataElements                       [4] OtherDataElements OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    ...

}



DigitalTokenName::= SEQUENCE

{

    digitalTokenLongName            [1] DigitalTokenLongName,

    digitalTokenShortName           [2] DigitalTokenShortName,

    digitalTokenLongName            [1] DigitalTokenLongName OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    digitalTokenShortName           [2] DigitalTokenShortName OPTIONAL,

        -- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.

    ...

}
@@ -2499,8 +2507,8 @@ DigitalTokenShortName ::= SEQUENCE 


TokenIdentifierType ::= SEQUENCE

{

    digitalTokenIdentifierType      [1] DigitalTokenIdentifierType,

    digitalLedgerTechnologyType     [2] DigitalLedgerTechnologyType,

    digitalTokenIdentifierType      [1] DigitalTokenIdentifierType OPTIONAL,

    digitalLedgerTechnologyType     [2] DigitalLedgerTechnologyType OPTIONAL,

    ...

}

102657/RDMessage.xsd

+11 −11
Original line number Diff line number Diff line
@@ -3540,9 +3540,9 @@ 
    </xsd:simpleType>

    <xsd:complexType name="DigitalTokenIdentifier">

        <xsd:sequence>

            <xsd:element name="baseRecord" type="BaseRecord"/>

            <xsd:element name="forkRecord" type="ForkRecord"/>

            <xsd:element name="informativeDataElements" type="InformativeDataElements"/>

            <xsd:element name="baseRecord" type="BaseRecord" minOccurs="0"/>

            <xsd:element name="forkRecord" type="ForkRecord" minOccurs="0"/>

            <xsd:element name="informativeDataElements" type="InformativeDataElements" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:simpleType name="BaseRecord">
@@ -3553,16 +3553,16 @@ 
    </xsd:simpleType>

    <xsd:complexType name="InformativeDataElements">

        <xsd:sequence>

            <xsd:element name="digitalTokenName" type="DigitalTokenName"/>

            <xsd:element name="tokenIdentifierType" type="TokenIdentifierType"/>

            <xsd:element name="dTIRegistrationAuthorityIdentifier" type="DTIRegistrationAuthorityIdentifier"/>

            <xsd:element name="otherDataElements" type="OtherDataElements"/>

            <xsd:element name="digitalTokenName" type="DigitalTokenName" minOccurs="0"/>

            <xsd:element name="tokenIdentifierType" type="TokenIdentifierType" minOccurs="0"/>

            <xsd:element name="dTIRegistrationAuthorityIdentifier" type="DTIRegistrationAuthorityIdentifier" minOccurs="0"/>

            <xsd:element name="otherDataElements" type="OtherDataElements" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:complexType name="DigitalTokenName">

        <xsd:sequence>

            <xsd:element name="digitalTokenLongName" type="DigitalTokenLongName"/>

            <xsd:element name="digitalTokenShortName" type="DigitalTokenShortName"/>

            <xsd:element name="digitalTokenLongName" type="DigitalTokenLongName" minOccurs="0"/>

            <xsd:element name="digitalTokenShortName" type="DigitalTokenShortName" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:complexType name="DigitalTokenLongName">
@@ -3579,8 +3579,8 @@ 
    </xsd:complexType>

    <xsd:complexType name="TokenIdentifierType">

        <xsd:sequence>

            <xsd:element name="digitalTokenIdentifierType" type="DigitalTokenIdentifierType"/>

            <xsd:element name="digitalLedgerTechnologyType" type="DigitalLedgerTechnologyType"/>

            <xsd:element name="digitalTokenIdentifierType" type="DigitalTokenIdentifierType" minOccurs="0"/>

            <xsd:element name="digitalLedgerTechnologyType" type="DigitalLedgerTechnologyType" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:complexType name="DigitalTokenIdentifierType">