Commit 1960db2e authored by Gabriel Commeau's avatar Gabriel Commeau Committed by Mark Canterbury
Browse files

Maintain backward compatibility with previous schemas rather than with the specification

parent 9f22c728
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@
                        }
                      ]
                    },
                    "config:AssociatedLDSubtypes": {},
                    "config:AssociatedLPSubtypes": {}
                    "config:AssociatedLDRequestSubtypes": {},
                    "config:AssociatedLPRequestSubtypes": {}
                  },
                  {
                    "config:FormatName": "PropietaryIdentifier",
@@ -98,8 +98,8 @@
                        }
                      ]
                    },
                    "config:AssociatedLDSubtypes": {},
                    "config:AssociatedLPSubtypes": {}
                    "config:AssociatedLDRequestSubtypes": {},
                    "config:AssociatedLPRequestSubtypes": {}
                  }
                ]
              },
+4 −4
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@
                                        <common:Value>ServiceA</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLIServiceTypes>
                                <config:AssociatedLDSubtypes/> <!-- In this example, no LD types are supported -->
                                <config:AssociatedLPSubtypes/> <!-- In this example, no LP types are supported -->
                                <config:AssociatedLDRequestSubtypes/> <!-- In this example, no LD types are supported -->
                                <config:AssociatedLPRequestSubtypes/> <!-- In this example, no LP types are supported -->
                            </config:TargetingConfiguration>
                            <config:TargetingConfiguration>
                                <config:FormatName>PropietaryIdentifier</config:FormatName>
@@ -81,8 +81,8 @@
                                        <common:Value>ServiceB</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLIServiceTypes>
                                <config:AssociatedLDSubtypes/> <!-- In this example, no LD types are supported -->
                                <config:AssociatedLPSubtypes/> <!-- In this example, no LP types are supported -->
                                <config:AssociatedLDRequestSubtypes/> <!-- In this example, no LD types are supported -->
                                <config:AssociatedLPRequestSubtypes/> <!-- In this example, no LP types are supported -->
                            </config:TargetingConfiguration>
                        </TargetingConfigurations>
                        <SupportedLIWorkflowEndpoints>
+16 −16
Original line number Diff line number Diff line
@@ -76,34 +76,34 @@
                                <config:FormatOwner>ACTOR02</config:FormatOwner>
                                <config:Guidance>This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for the propietary identifier format type described in the TargetFormatTypeDefinitions, associated with Service A for the "Subscriber Data" category only</config:Guidance>
                                <config:AssociatedLIServiceTypes/> <!-- In this example, no LI types are supported -->
                                <config:AssociatedLDTypes>
                                <config:AssociatedLDRequestTypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ETSI</common:Owner>
                                        <common:Name>RequestType</common:Name>
                                        <common:Value>SubscriberData</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLDTypes>
                                <config:AssociatedLDSubtypes>
                                </config:AssociatedLDRequestTypes>
                                <config:AssociatedLDRequestSubtypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ACTOR02</common:Owner>
                                        <common:Name>LDRequestSubtype</common:Name>
                                        <common:Value>ServiceA</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLDSubtypes>
                                <config:AssociatedLPTypes>
                                </config:AssociatedLDRequestSubtypes>
                                <config:AssociatedLPRequestTypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ETSI</common:Owner>
                                        <common:Name>RequestType</common:Name>
                                        <common:Value>SubscriberData</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLPTypes>
                                <config:AssociatedLPSubtypes>
                                </config:AssociatedLPRequestTypes>
                                <config:AssociatedLPRequestSubtypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ACTOR02</common:Owner>
                                        <common:Name>LPRequestSubtype</common:Name>
                                        <common:Value>ServiceA</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLPSubtypes>
                                </config:AssociatedLPRequestSubtypes>
                            </config:TargetingConfiguration>
                            <!-- Second Targeting Configuration -->
                            <config:TargetingConfiguration>
@@ -111,7 +111,7 @@
                                <config:FormatOwner>ETSI</config:FormatOwner>
                                <config:Guidance>This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for a telephone number (as ETSI standard format E164 number) associated with Service A and Service B for the "Traffic Data" and "Content Data" categories</config:Guidance>
                                <config:AssociatedLIServiceTypes/> <!-- In this example, no LI types are supported -->
                                <config:AssociatedLDTypes>
                                <config:AssociatedLDRequestTypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ETSI</common:Owner>
                                        <common:Name>RequestType</common:Name>
@@ -122,8 +122,8 @@
                                        <common:Name>RequestType</common:Name>
                                        <common:Value>StoredContentData</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLDTypes>
                                <config:AssociatedLDSubtypes>
                                </config:AssociatedLDRequestTypes>
                                <config:AssociatedLDRequestSubtypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ACTOR02</common:Owner>
                                        <common:Name>LDRequestSubtype</common:Name>
@@ -134,8 +134,8 @@
                                        <common:Name>LDRequestSubtype</common:Name>
                                        <common:Value>ServiceB</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLDSubtypes>
                                <config:AssociatedLPTypes>
                                </config:AssociatedLDRequestSubtypes>
                                <config:AssociatedLPRequestTypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ETSI</common:Owner>
                                        <common:Name>RequestType</common:Name>
@@ -146,8 +146,8 @@
                                        <common:Name>RequestType</common:Name>
                                        <common:Value>StoredContentData</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLPTypes>
                                <config:AssociatedLPSubtypes>
                                </config:AssociatedLPRequestTypes>
                                <config:AssociatedLPRequestSubtypes>
                                    <common:DictionaryEntry>
                                        <common:Owner>ACTOR02</common:Owner>
                                        <common:Name>LPRequestSubtype</common:Name>
@@ -158,7 +158,7 @@
                                        <common:Name>LPRequestSubtype</common:Name>
                                        <common:Value>ServiceB</common:Value>
                                    </common:DictionaryEntry>
                                </config:AssociatedLPSubtypes>
                                </config:AssociatedLPRequestSubtypes>
                            </config:TargetingConfiguration>
                        </TargetingConfigurations>
                        <SupportedLIWorkflowEndpoints/>
+4 −4
Original line number Diff line number Diff line
@@ -79,16 +79,16 @@
        "config:AssociatedLIServiceTypes": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries"
        },
        "config:AssociatedLDTypes": {
        "config:AssociatedLDRequestTypes": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries"
        },
        "config:AssociatedLDSubtypes": {
        "config:AssociatedLDRequestSubtypes": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries"
        },
        "config:AssociatedLPTypes": {
        "config:AssociatedLPRequestTypes": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries"
        },
        "config:AssociatedLPSubtypes": {
        "config:AssociatedLPRequestSubtypes": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries"
        }
      },
+4 −4
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@
            <xs:element name="FormatOwner" type="etsi:ShortString"/>
            <xs:element name="Guidance" type="etsi:LongString" minOccurs="0"/>
            <xs:element name="AssociatedLIServiceTypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLDTypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLDSubtypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLPTypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLPSubtypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLDRequestTypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLDRequestSubtypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLPRequestTypes" type="common:DictionaryEntries" minOccurs="0"/>
            <xs:element name="AssociatedLPRequestSubtypes" type="common:DictionaryEntries" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="SupportedLIWorkflowEndpoints">
Loading