From 7864c18a8cc2229a0cd104542a218d4494ac56e5 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Fri, 18 Feb 2022 13:53:39 +0000
Subject: [PATCH] Revert "Merge branch 'cr/103221-1/032' into 'master'"

This reverts merge request !60
---
 103221-1/TS_103_221_01.xsd                    |  3 +-
 103221-1/TS_103_221_01_DestinationSet.xsd     | 40 ---------
 .../examples/CreateDestinationSet_example.xml | 88 -------------------
 3 files changed, 1 insertion(+), 130 deletions(-)
 delete mode 100644 103221-1/TS_103_221_01_DestinationSet.xsd
 delete mode 100644 103221-1/examples/CreateDestinationSet_example.xml

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 3fb6cb9..490e9c4 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.11.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.10.1">
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
 	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
 	<!-- Message containers -->
@@ -299,7 +299,6 @@
 	<xs:complexType name="ListOfDids">
 		<xs:sequence>
 			<xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="dSId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ListOfMediationDetails">
diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd
deleted file mode 100644
index 1bdcb98..0000000
--- a/103221-1/TS_103_221_01_DestinationSet.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" elementFormDefault="qualified" version="1.11.1">
-	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
-	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
-	<!-- Message containers -->
-	<xs:complexType name="DestinationSetDetails">
-		<xs:complexContent>
-			<xs:extension base="x1:GenericObject">
-				<xs:sequence>
-					<xs:element name="friendlyName" type="xs:string" minOccurs="0"/>
-					<xs:element name="listOfAssociatedDIDs" type="ListOfAssociatedDIDs"/>
-					<xs:element name="destinationSetDetailsExtension" type="DestinationSetDetailsExtension" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="destinationSetType" type="DestinationSetType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ListOfAssociatedDIDs">
-		<xs:sequence>
-			<xs:element name="AssociatedDID" type="AssociatedDID" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AssociatedDID">
-		<xs:sequence>
-			<xs:element name="dId" type="x1:DId"/>
-			<xs:element name="preference" type="xs:integer"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="DestinationSetDetailsExtension">
-		<xs:complexContent>
-			<xs:extension base="x1:Extension" />			
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:simpleType name="DestinationSetType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Redundant"/>
-			<xs:enumeration value="Duplicate"/>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
diff --git a/103221-1/examples/CreateDestinationSet_example.xml b/103221-1/examples/CreateDestinationSet_example.xml
deleted file mode 100644
index c1388b4..0000000
--- a/103221-1/examples/CreateDestinationSet_example.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" ?>
-<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet">
-	<x1RequestMessage xsi:type="CreateDestinationRequest">
-		<admfIdentifier>admfID</admfIdentifier>
-		<neIdentifier>neID</neIdentifier>
-		<messageTimestamp>2022-02-16T18:46:21.247432Z</messageTimestamp>
-		<version>v1.11.1</version>
-		<x1TransactionId>7fa872e0-4bc7-4a98-a416-5f22b3de1dca</x1TransactionId>
-		<destinationDetails>
-			<dId>44b739c4-73f0-48d5-8d6a-3576ab100141</dId>
-			<deliveryType>X2andX3</deliveryType>
-			<deliveryAddress>
-				<ipAddressAndPort>
-					<address xmlns="http://uri.etsi.org/03280/common/2017/07">
-						<IPv4Address>203.0.113.1</IPv4Address>
-					</address>
-					<port xmlns="http://uri.etsi.org/03280/common/2017/07">
-						<TCPPort>9999</TCPPort>
-					</port>
-				</ipAddressAndPort>
-			</deliveryAddress>
-		</destinationDetails>
-	</x1RequestMessage>
-	<x1RequestMessage xsi:type="CreateDestinationRequest">
-		<admfIdentifier>admfID</admfIdentifier>
-		<neIdentifier>neID</neIdentifier>
-		<messageTimestamp>2022-02-16T18:46:21.247432Z</messageTimestamp>
-		<version>v1.11.1</version>
-		<x1TransactionId>8286e40c-0b4b-4d4c-94f0-1e7ab8489e44</x1TransactionId>
-		<destinationDetails>
-			<dId>36adec69-e0f0-4a41-8e85-66bbe12c5a60</dId>
-			<deliveryType>X2andX3</deliveryType>
-			<deliveryAddress>
-				<ipAddressAndPort>
-					<address xmlns="http://uri.etsi.org/03280/common/2017/07">
-						<IPv4Address>203.0.113.2</IPv4Address>
-					</address>
-					<port xmlns="http://uri.etsi.org/03280/common/2017/07">
-						<TCPPort>9999</TCPPort>
-					</port>
-				</ipAddressAndPort>
-			</deliveryAddress>
-		</destinationDetails>
-	</x1RequestMessage>
-	<x1RequestMessage xsi:type="CreateObjectRequest">
-    <admfIdentifier>admfID</admfIdentifier>
-    <neIdentifier>neID</neIdentifier>
-    <messageTimestamp>2022-02-16T18:46:21.247432Z</messageTimestamp>
-    <version>v1.11.1</version>
-    <x1TransactionId>7afbf8e3-7699-4008-ac1a-4475ed50c14b</x1TransactionId>
-    <createObject xsi:type="destinationSet:DestinationSetDetails">
-      <objectId>30fbde5e-3195-4a22-b3e9-15e1d60d0528</objectId>
-			<destinationSet:friendlyName>My First Destination Set</destinationSet:friendlyName>
-			<destinationSet:listOfAssociatedDIDs>
-				<destinationSet:AssociatedDID>
-					<destinationSet:dId>44b739c4-73f0-48d5-8d6a-3576ab100141</destinationSet:dId>
-					<destinationSet:preference>1</destinationSet:preference>
-				</destinationSet:AssociatedDID>
-				<destinationSet:AssociatedDID>
-					<destinationSet:dId>36adec69-e0f0-4a41-8e85-66bbe12c5a60</destinationSet:dId>
-					<destinationSet:preference>2</destinationSet:preference>
-				</destinationSet:AssociatedDID>
-			</destinationSet:listOfAssociatedDIDs>
-			<destinationSet:destinationSetType>Redundant</destinationSet:destinationSetType>
-    </createObject>
-  </x1RequestMessage>
-	<x1RequestMessage xsi:type="ActivateTaskRequest">
-		<admfIdentifier>admfID</admfIdentifier>
-		<neIdentifier>neID</neIdentifier>
-		<messageTimestamp>2022-02-16T18:46:21.247432Z</messageTimestamp>
-		<version>v1.11.1</version>
-		<x1TransactionId>4afef6be-5252-41cb-9275-123d308deb50</x1TransactionId>
-		<taskDetails>
-			<xId>1d7d7eb7-e0b9-4a5c-827a-bc3639d48124</xId>
-			<targetIdentifiers>
-				<targetIdentifier>
-					<e164Number>6125550123</e164Number>
-				</targetIdentifier>
-			</targetIdentifiers>
-			<deliveryType>X2andX3</deliveryType>
-			<listOfDIDs>
-				<dSId>30fbde5e-3195-4a22-b3e9-15e1d60d0528</dSId>
-			</listOfDIDs>
-		</taskDetails>
-	</x1RequestMessage>
-</X1Request>
-- 
GitLab