Commit cf573e2c authored by mewburn's avatar mewburn
Browse files

*.xml, *.xsd: reformat using xmllint 

Reformat the .xml and .xsd files using
	env XMLLINT_INDENT="    " xmllint --encode UTF-8 --format FILENAME.xml

Notable (non-whitespace) changes to the existing files:
- Ensure the <xml ...> header has encoding="UTF-8".
- <xs:schema ...> collapsed to one line and some attribute reordered.
- Empty tags are converted to self-closing tags. E.g.
	<xs:element name="Name" type="Type"></xs:element:>
  becomes
	<xs:element name="Name" type="Type"/>
- Some xmlns related attributes are reordered.

Per discussion with rapporteurs and Mark Canterbury.
parent d0b92b60

102657/RDMessage.xsd

+6 −16
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<?xml version="1.0" encoding="UTF-8"?>

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.29.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.29.1#/RetainedData" elementFormDefault="qualified">

    <xsd:annotation>

        <xsd:documentation xml:lang="en">
@@ -3325,7 +3325,6 @@ 
            <xsd:element name="edgeComputingDevice" type="EdgeComputingDevice"/>

        </xsd:choice>

    </xsd:complexType>



    <xsd:complexType name="EdgeComputingSubscriber">

        <xsd:sequence>

            <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
@@ -3346,7 +3345,6 @@ 
    <xsd:simpleType name="EdgeComputingSubscriberInfo">

        <xsd:restriction base="xsd:string"/>

    </xsd:simpleType>



    <xsd:complexType name="SubscribedEdgeComputingApplications">

        <xsd:sequence>

            <xsd:element name="edgeComputingApplicationID" type="xsd:string" minOccurs="0"/>
@@ -3388,7 +3386,6 @@ 
            </xsd:element>

        </xsd:sequence>

    </xsd:complexType>



    <xsd:complexType name="EdgeComputingApplicationUsage">

        <xsd:sequence>

            <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
@@ -3410,7 +3407,6 @@ 
            </xsd:element>

        </xsd:sequence>

    </xsd:complexType>



    <xsd:complexType name="EdgeApplicationServerInfo">

        <xsd:sequence>

            <xsd:element name="edgeApplicationServerID" type="xsd:string" minOccurs="0"/>
@@ -3419,7 +3415,6 @@ 
            <xsd:element name="edgeApplicationServerVirtualResources" type="EdgeApplicationServerVirtualResources" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>



    <xsd:complexType name="EdgeApplicationServerVirtualResources">

        <xsd:sequence>

            <xsd:element name="meanVirtualCPUUsage" type="xsd:float" minOccurs="0"/>
@@ -3429,7 +3424,6 @@ 
            <xsd:element name="durationEndTime" type="GeneralizedTime" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>



    <xsd:complexType name="EdgeComputingApplicationBillingDetails">

        <xsd:sequence>

            <xsd:element name="subscriberID" type="EdgeComputingSubscriberID" minOccurs="0"/>
@@ -3453,7 +3447,6 @@ 
            </xsd:element>

        </xsd:sequence>

    </xsd:complexType>



    <xsd:complexType name="EdgeComputingBillingAddress">

        <xsd:sequence>

            <xsd:element name="addressSuppliedTime" type="GeneralizedTime" minOccurs="0"/>
@@ -3464,7 +3457,6 @@ 
    <xsd:simpleType name="EdgeComputingBillingIdentifier">

        <xsd:restriction base="xsd:string"/>

    </xsd:simpleType>



    <xsd:complexType name="EdgeComputingApplicationBillingRecords">

        <xsd:sequence>

            <xsd:element name="time" type="GeneralizedTime" minOccurs="0"/>
@@ -3482,8 +3474,6 @@ 
            <xsd:element name="edgeComputingTransactionStatus" type="xsd:string" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>





    <xsd:complexType name="EdgeComputingDevice">

        <xsd:sequence>

            <xsd:element name="deviceIDType" minOccurs="0">

103120/dictionaries/ts_103120_Dictionaries.xsd

+10 −14
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="http://uri.etsi.org/03280/common/2019/10/Dictionaries"

           targetNamespace="http://uri.etsi.org/03280/common/2019/10/Dictionaries"

           elementFormDefault="qualified"

           attributeFormDefault="unqualified">

<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries" targetNamespace="http://uri.etsi.org/03280/common/2019/10/Dictionaries" elementFormDefault="qualified" attributeFormDefault="unqualified">

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

    <xs:complexType name="Dictionaries">

        <xs:sequence>

            <xs:element name="Dictionary" type="Dictionary" minOccurs="0" maxOccurs="unbounded"></xs:element>

            <xs:element name="Dictionary" type="Dictionary" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="Dictionary">

        <xs:sequence>

            <xs:element name="Owner" type="xs:string"></xs:element>

            <xs:element name="Name" type="xs:string"></xs:element>

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

            <xs:element name="Owner" type="xs:string"/>

            <xs:element name="Name" type="xs:string"/>

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

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="DictionaryEntries">

        <xs:sequence>

            <xs:element name="DictionaryEntry" type="DictionaryEntry" minOccurs="0" maxOccurs="unbounded"></xs:element>

            <xs:element name="DictionaryEntry" type="DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="DictionaryEntry">

        <xs:sequence>

            <xs:element name="Value" type="xs:string"></xs:element>

            <xs:element name="Meaning" type="xs:string"></xs:element>

            <xs:element name="Value" type="xs:string"/>

            <xs:element name="Meaning" type="xs:string"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+51 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<?xml version="1.0" encoding="UTF-8"?>

<Dictionaries xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries">

    <Dictionary>                                            <!--ObjectType: see Clause 6.4.8 Table 6.14 -->

    <Dictionary>

        <!--ObjectType: see Clause 6.4.8 Table 6.14 -->

        <Owner>ETSI</Owner>

        <Name>ObjectType</Name>

        <DictionaryEntries>
@@ -30,7 +31,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--AuthorisationLegalType: see Clause 7.2.3 Table 7.4 -->

    <Dictionary>

        <!--AuthorisationLegalType: see Clause 7.2.3 Table 7.4 -->

        <Owner>ETSI</Owner>

        <Name>AuthorisationLegalType</Name>

        <DictionaryEntries>
@@ -40,7 +42,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--AuthorisationPriority: see Clause 7.2.4 Table 7.5 -->

    <Dictionary>

        <!--AuthorisationPriority: see Clause 7.2.4 Table 7.5 -->

        <Owner>ETSI</Owner>

        <Name>AuthorisationPriority</Name>

        <DictionaryEntries>
@@ -54,7 +57,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--AuthorisationStatus: see Clause 7.2.5 Table 7.6 -->

    <Dictionary>

        <!--AuthorisationStatus: see Clause 7.2.5 Table 7.6 -->

        <Owner>ETSI</Owner>

        <Name>AuthorisationStatus</Name>

        <DictionaryEntries>
@@ -100,7 +104,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--AuthorisationDesiredStatus: see Clause 7.2.6 Table 7.7 -->

    <Dictionary>

        <!--AuthorisationDesiredStatus: see Clause 7.2.6 Table 7.7 -->

        <Owner>ETSI</Owner>

        <Name>AuthorisationDesiredStatus</Name>

        <DictionaryEntries>
@@ -142,7 +147,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--AuthorisationFlags: see Clause 7.2.5 Table 7.6 -->

    <Dictionary>

        <!--AuthorisationFlags: see Clause 7.2.5 Table 7.6 -->

        <Owner>ETSI</Owner>

        <Name>AuthorisationFlag</Name>

        <DictionaryEntries>
@@ -160,7 +166,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--AuthorisationTypeOfCase: see Clause 7.2.14 -->

    <Dictionary>

        <!--AuthorisationTypeOfCase: see Clause 7.2.14 -->

        <Owner>ETSI</Owner>

        <Name>AuthorisationTypeOfCase</Name>

        <DictionaryEntries>
@@ -234,7 +241,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--DocumentStatus: see Clause 7.3.4 Table 7.11 -->

    <Dictionary>

        <!--DocumentStatus: see Clause 7.3.4 Table 7.11 -->

        <Owner>ETSI</Owner>

        <Name>DocumentStatus</Name>

        <DictionaryEntries>
@@ -268,7 +276,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--DocumentDesiredStatus: see Clause 7.3.5 Table 7.12 -->

    <Dictionary>

        <!--DocumentDesiredStatus: see Clause 7.3.5 Table 7.12 -->

        <Owner>ETSI</Owner>

        <Name>DocumentDesiredStatus</Name>

        <DictionaryEntries>
@@ -298,7 +307,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--DocumentType: see Clause 7.3.7 Table 7.14 -->

    <Dictionary>

        <!--DocumentType: see Clause 7.3.7 Table 7.14 -->

        <Owner>ETSI</Owner>

        <Name>DocumentType</Name>

        <DictionaryEntries>
@@ -308,7 +318,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--NotificationType: see Clause 7.4.3 Table 7.18 -->

    <Dictionary>

        <!--NotificationType: see Clause 7.4.3 Table 7.18 -->

        <Owner>ETSI</Owner>

        <Name>NotificationType</Name>

        <DictionaryEntries>
@@ -318,7 +329,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--TrafficAction: see Clause 7.6.3 -->

    <Dictionary>

        <!--TrafficAction: see Clause 7.6.3 -->

        <Owner>ETSI</Owner>

        <Name>TrafficAction</Name>

        <DictionaryEntries>
@@ -336,7 +348,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--TaskStatus: see Clause 8.2.3 Table 8.2 -->

    <Dictionary>

        <!--TaskStatus: see Clause 8.2.3 Table 8.2 -->

        <Owner>ETSI</Owner>

        <Name>TaskStatus</Name>

        <DictionaryEntries>
@@ -378,7 +391,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--TaskDesiredStatus: see Clause 8.3.3 Table 8.3 -->

    <Dictionary>

        <!--TaskDesiredStatus: see Clause 8.3.3 Table 8.3 -->

        <Owner>ETSI</Owner>

        <Name>TaskDesiredStatus</Name>

        <DictionaryEntries>
@@ -412,12 +426,15 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--TaskServiceType: see Clause 8.2.6.4 Table 8.9 -->

    <Dictionary>

        <!--TaskServiceType: see Clause 8.2.6.4 Table 8.9 -->

        <Owner>ETSI</Owner>

        <Name>TaskServiceType</Name>

        <DictionaryEntries></DictionaryEntries>             <!--No definition so far -->

        <DictionaryEntries/>

        <!--No definition so far -->

    </Dictionary>

    <Dictionary>                                            <!--TaskDeliveryType: see Clause 8.2.7 Table 8.10 -->

    <Dictionary>

        <!--TaskDeliveryType: see Clause 8.2.7 Table 8.10 -->

        <Owner>ETSI</Owner>

        <Name>TaskDeliveryType</Name>

        <DictionaryEntries>
@@ -435,7 +452,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--HandoverFormat: see Clause 8.2.8.4 Table 8.13 -->

    <Dictionary>

        <!--HandoverFormat: see Clause 8.2.8.4 Table 8.13 -->

        <Owner>ETSI</Owner>

        <Name>HandoverFormat</Name>

        <DictionaryEntries>
@@ -465,7 +483,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--TaskFlag: see Clause 8.2.12 Table 8.14 -->

    <Dictionary>

        <!--TaskFlag: see Clause 8.2.12 Table 8.14 -->

        <Owner>ETSI</Owner>

        <Name>TaskFlag</Name>

        <DictionaryEntries>
@@ -487,7 +506,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--LDTaskStatus: see Clause 8.3.3 Table 8.16 -->

    <Dictionary>

        <!--LDTaskStatus: see Clause 8.3.3 Table 8.16 -->

        <Owner>ETSI</Owner>

        <Name>LDTaskStatus</Name>

        <DictionaryEntries>
@@ -525,7 +545,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--LDTaskDesiredStatus: see Clause 8.3.4 Table 8.17 -->

    <Dictionary>

        <!--LDTaskDesiredStatus: see Clause 8.3.4 Table 8.17 -->

        <Owner>ETSI</Owner>

        <Name>LDTaskDesiredStatus</Name>

        <DictionaryEntries>
@@ -551,7 +572,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

<Dictionary>                                            <!--RequestType: see Clause 8.3.5.2 Table 8.19 -->

    <Dictionary>

        <!--RequestType: see Clause 8.3.5.2 Table 8.19 -->

        <Owner>ETSI</Owner>

        <Name>RequestType</Name>

        <DictionaryEntries>
@@ -577,7 +599,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--LDHandoverFormat: see Clause 8.3.5.2 Table 8.19 -->

    <Dictionary>

        <!--LDHandoverFormat: see Clause 8.3.5.2 Table 8.19 -->

        <Owner>ETSI</Owner>

        <Name>LDHandoverFormat</Name>

        <DictionaryEntries>
@@ -599,7 +622,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--LDTaskFlag: see Clause 8.3.7 Table 8.25 -->

    <Dictionary>

        <!--LDTaskFlag: see Clause 8.3.7 Table 8.25 -->

        <Owner>ETSI</Owner>

        <Name>LDTaskFlag</Name>

        <DictionaryEntries>
@@ -621,7 +645,8 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>                                            <!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->

    <Dictionary>

        <!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->

        <Owner>ETSI</Owner>

        <Name>ManifestSpecification</Name>

        <DictionaryEntries>

103120/examples/FooServiceSchema.xsd

+17 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema targetNamespace="http://FooServiceSchema.example.com/schema/v1.1.1/"

    elementFormDefault="qualified"

    xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/"

    xmlns:mstns="http://tempuri.org/XMLSchema.xsd"

    xmlns:xs="http://www.w3.org/2001/XMLSchema"

>



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



<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/" xmlns:mstns="http://tempuri.org/XMLSchema.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://FooServiceSchema.example.com/schema/v1.1.1/" elementFormDefault="qualified">

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

    <xs:complexType name="FooItem">

        <xs:sequence>

      <xs:element name="item1" type="ItemType"></xs:element>

      <xs:element name="item2" type="ItemType"></xs:element>

      <xs:element name="item3" type="ItemType"></xs:element>

            <xs:element name="item1" type="ItemType"/>

            <xs:element name="item2" type="ItemType"/>

            <xs:element name="item3" type="ItemType"/>

        </xs:sequence>

    </xs:complexType>



    <xs:simpleType name="ItemType">

        <xs:restriction base="xs:string">

      <xs:enumeration value="Foo"></xs:enumeration>

      <xs:enumeration value="Bar"></xs:enumeration>

      <xs:enumeration value="Baz"></xs:enumeration>

            <xs:enumeration value="Foo"/>

            <xs:enumeration value="Bar"/>

            <xs:enumeration value="Baz"/>

        </xs:restriction>

    </xs:simpleType>



</xs:schema>

103120/examples/mutliple-auth-example-request.xml

+49 −49
Original line number Diff line number Diff line 
<?xml version="1.0" ?>

<?xml version="1.0" encoding="UTF-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

    <Header>

        <SenderIdentifier>