From d83a65027bac005a81cd532ec1e4687dc855db50 Mon Sep 17 00:00:00 2001
From: matthew meacham <matthew.meacham@baesystems.com>
Date: Thu, 13 Jan 2022 09:57:48 +0000
Subject: [PATCH 1/8] Update 103221-1/TS_103_221_01.xsd

---
 103221-1/TS_103_221_01.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 490e9c4..711dc9b 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" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.10.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" 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:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
 	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
 	<!-- Message containers -->
-- 
GitLab


From 1da35bf13d3e33ea817c9d6613d9e897e2f46311 Mon Sep 17 00:00:00 2001
From: matthew meacham <matthew.meacham@baesystems.com>
Date: Thu, 13 Jan 2022 09:58:25 +0000
Subject: [PATCH 2/8] Update 103221-1/TS_103_221_01_DestinationSet.xsd

---
 103221-1/TS_103_221_01_DestinationSet.xsd | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 103221-1/TS_103_221_01_DestinationSet.xsd

diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd
new file mode 100644
index 0000000..2da24cf
--- /dev/null
+++ b/103221-1/TS_103_221_01_DestinationSet.xsd
@@ -0,0 +1,33 @@
+<?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/HashedID" 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="listOfIncludedDID" type="ListOfIncludedDID"/>
+					<xs:element name="destinationSetDetailsExtension" type="DestinationSetDetailsExtension" minOccurs="0" maxOccurs="unbounded"/>
+					<xs:element name="type" type="Type"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListOfIncludedDID">
+		<xs:sequence>
+			<xs:element name="dId" type="x1:DId"/>
+			<xs:element name="preference" type="xs:integer"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="DestinationSetDetailsExtension">
+		<xs:restriction base="x1:Extension">
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="Type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Redundant"/>
+			<xs:enumeration value="Duplicate"/>
+		</xs:restriction>
+</xs:schema>
-- 
GitLab


From fd72c62e45a8d8c3ad42174c3fccca6c225af5f4 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Tue, 15 Feb 2022 15:01:41 +0000
Subject: [PATCH 3/8] thanks

---
 103221-1/TS_103_221_01_DestinationSet.xsd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd
index 2da24cf..614d93b 100644
--- a/103221-1/TS_103_221_01_DestinationSet.xsd
+++ b/103221-1/TS_103_221_01_DestinationSet.xsd
@@ -25,9 +25,10 @@
 		<xs:restriction base="x1:Extension">
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="Type">
+	<xs:simpleType name="DestinationSetType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="Redundant"/>
 			<xs:enumeration value="Duplicate"/>
 		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>
-- 
GitLab


From 5bf45fd42690fb6ba5aea1ffa00e6858671760e6 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Tue, 15 Feb 2022 15:02:32 +0000
Subject: [PATCH 4/8] Apply 1 suggestion(s) to 1 file(s)

---
 103221-1/TS_103_221_01.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 711dc9b..9065305 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -299,6 +299,7 @@
 	<xs:complexType name="ListOfDids">
 		<xs:sequence>
 			<xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="dSId" type="DSId" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ListOfMediationDetails">
-- 
GitLab


From ba44fb5165c333e8921f8202b0e97611f0e3d540 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Tue, 15 Feb 2022 15:03:16 +0000
Subject: [PATCH 5/8] Apply 1 suggestion(s) to 1 file(s)

---
 103221-1/TS_103_221_01_DestinationSet.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd
index 614d93b..98abc13 100644
--- a/103221-1/TS_103_221_01_DestinationSet.xsd
+++ b/103221-1/TS_103_221_01_DestinationSet.xsd
@@ -8,7 +8,7 @@
 			<xs:extension base="x1:GenericObject">
 				<xs:sequence>
 					<xs:element name="friendlyName" type="xs:string" minOccurs="0"/>>
-					<xs:element name="listOfIncludedDID" type="ListOfIncludedDID"/>
+					<xs:element name="listOfAssociatedDIDs" type="ListOfAssociatedDIDs"/>
 					<xs:element name="destinationSetDetailsExtension" type="DestinationSetDetailsExtension" minOccurs="0" maxOccurs="unbounded"/>
 					<xs:element name="type" type="Type"/>
 				</xs:sequence>
-- 
GitLab


From a90c83edbba0d72879af0d5133de2230445edf02 Mon Sep 17 00:00:00 2001
From: canterburym <markc@tencastle.com>
Date: Tue, 15 Feb 2022 15:18:56 +0000
Subject: [PATCH 6/8] Apply 1 suggestion(s) to 1 file(s)

---
 103221-1/TS_103_221_01_DestinationSet.xsd | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd
index 98abc13..cdabde5 100644
--- a/103221-1/TS_103_221_01_DestinationSet.xsd
+++ b/103221-1/TS_103_221_01_DestinationSet.xsd
@@ -15,7 +15,12 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="ListOfIncludedDID">
+	<xs:complexType name="ListOfAssociatedDIDs">
+		<xs:sequence>
+			<xs:element name="AssociatedDID" type="ListOfAssociatedDID" 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"/>
-- 
GitLab


From 29713dfe4862a9af8404db8aa4efcc3bd85cd907 Mon Sep 17 00:00:00 2001
From: matthew meacham <matthew.meacham@baesystems.com>
Date: Tue, 15 Feb 2022 15:27:18 +0000
Subject: [PATCH 7/8] Update 103221-1/TS_103_221_01_DestinationSet.xsd

---
 103221-1/TS_103_221_01_DestinationSet.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd
index cdabde5..2bb7714 100644
--- a/103221-1/TS_103_221_01_DestinationSet.xsd
+++ b/103221-1/TS_103_221_01_DestinationSet.xsd
@@ -10,7 +10,7 @@
 					<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="type" type="Type"/>
+					<xs:element name="destinationSetType" type="DestinationSetType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
-- 
GitLab


From fba81f43af152f5c7dc95a3be19c54058d3b0fec Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Wed, 16 Feb 2022 07:59:54 +0000
Subject: [PATCH 8/8] Fixes and examples

---
 103221-1/TS_103_221_01.xsd                    |  2 +-
 103221-1/TS_103_221_01_DestinationSet.xsd     | 15 ++--
 .../examples/CreateDestinationSet_example.xml | 88 +++++++++++++++++++
 3 files changed, 97 insertions(+), 8 deletions(-)
 create 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 9065305..3fb6cb9 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -299,7 +299,7 @@
 	<xs:complexType name="ListOfDids">
 		<xs:sequence>
 			<xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="dSId" type="DSId" 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
index 2bb7714..1bdcb98 100644
--- a/103221-1/TS_103_221_01_DestinationSet.xsd
+++ b/103221-1/TS_103_221_01_DestinationSet.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/HashedID" 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: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 -->
@@ -7,7 +7,7 @@
 		<xs:complexContent>
 			<xs:extension base="x1:GenericObject">
 				<xs:sequence>
-					<xs:element name="friendlyName" type="xs:string" minOccurs="0"/>>
+					<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"/>
@@ -17,7 +17,7 @@
 	</xs:complexType>
 	<xs:complexType name="ListOfAssociatedDIDs">
 		<xs:sequence>
-			<xs:element name="AssociatedDID" type="ListOfAssociatedDID" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="AssociatedDID" type="AssociatedDID" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AssociatedDID">
@@ -26,10 +26,11 @@
 			<xs:element name="preference" type="xs:integer"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:simpleType name="DestinationSetDetailsExtension">
-		<xs:restriction base="x1:Extension">
-		</xs:restriction>
-	</xs:simpleType>
+	<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"/>
diff --git a/103221-1/examples/CreateDestinationSet_example.xml b/103221-1/examples/CreateDestinationSet_example.xml
new file mode 100644
index 0000000..c1388b4
--- /dev/null
+++ b/103221-1/examples/CreateDestinationSet_example.xml
@@ -0,0 +1,88 @@
+<?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