From fcf0ae9c7a2c972373c9dfd93573f08af6423ec7 Mon Sep 17 00:00:00 2001
From: SvS <239-svs@users.noreply.forge.etsi.org>
Date: Mon, 11 Oct 2021 07:50:34 +0200
Subject: [PATCH 1/3] Update ApproverDetails to include EmailAddress and
 PhoneNumber and reflect it in the examples

---
 103120/examples/request3.xml       | 2 ++
 103120/schema/ts_103120_Common.xsd | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml
index 5da0df3..b68bfd3 100644
--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -40,6 +40,8 @@
                 <doc:DocumentSignature>
                   <common:ApproverDetails>
                     <common:ApproverName>Approver</common:ApproverName>
+                    <common:ApproverEmailAddress>john.doe@example.com</common:ApproverEmailAddress>
+                    <common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>
                   </common:ApproverDetails>
                   <common:ApprovalTimestamp>2015-09-01T12:00:00Z</common:ApprovalTimestamp>
                 </doc:DocumentSignature>
diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd
index 6ebf340..bebc3a3 100644
--- a/103120/schema/ts_103120_Common.xsd
+++ b/103120/schema/ts_103120_Common.xsd
@@ -36,6 +36,8 @@
 		<xs:sequence>
 			<xs:element name="ApproverName" type="etsi:LongString" minOccurs="0"></xs:element>
 			<xs:element name="ApproverRole" type="etsi:LongString" minOccurs="0"></xs:element>
+			<xs:element name="ApproverEmailAddress" type="etsi:EmailAddress" minOccurs="0"></xs:element>
+			<xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"></xs:element>
 			<xs:element name="ApproverIdentity" type="ApproverIdentity" minOccurs="0"></xs:element>
 		</xs:sequence>
 	</xs:complexType>
-- 
GitLab


From 8dd34312e87a5f24520671137b627106f44d173e Mon Sep 17 00:00:00 2001
From: SvS <239-svs@users.noreply.forge.etsi.org>
Date: Wed, 20 Oct 2021 08:11:11 +0200
Subject: [PATCH 2/3] - Update Common to change
 ApproverEmailAddress/ApproverPhoneNumber into ApproverContactDetails - Update
 examples/request3.xml to use multiple ApproverContactDetails - Remove
 whitespace from examples

---
 103120/examples/request3.xml       | 11 +++++++++--
 103120/examples/response2.xml      |  4 ++--
 103120/examples/response5.xml      | 10 +++++-----
 103120/schema/ts_103120_Common.xsd | 11 +++++++++--
 103120/schema/ts_103120_Core.xsd   |  2 +-
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml
index b68bfd3..451cf94 100644
--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -40,8 +40,15 @@
                 <doc:DocumentSignature>
                   <common:ApproverDetails>
                     <common:ApproverName>Approver</common:ApproverName>
-                    <common:ApproverEmailAddress>john.doe@example.com</common:ApproverEmailAddress>
-                    <common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>
+                    <common:ApproverContactDetails>
+                     <common:ApproverEmailAddress>john.doe@example.com</common:ApproverEmailAddress>
+                     <common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>
+                    </common:ApproverContactDetails>
+                    <common:ApproverContactDetails>
+                     <common:ApproverAlternateName>Jane Doe</common:ApproverAlternateName>
+                     <common:ApproverEmailAddress>jane.doe@example.com</common:ApproverEmailAddress>
+                     <common:ApproverPhoneNumber>442079461110</common:ApproverPhoneNumber>
+                    </common:ApproverContactDetails>
                   </common:ApproverDetails>
                   <common:ApprovalTimestamp>2015-09-01T12:00:00Z</common:ApprovalTimestamp>
                 </doc:DocumentSignature>
diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml
index 9ae5d35..2aa59c8 100644
--- a/103120/examples/response2.xml
+++ b/103120/examples/response2.xml
@@ -94,11 +94,11 @@
                   <task:InvalidReason>
                     <ErrorCode>3000</ErrorCode>
                     <ErrorDescription>The associated Authorisation is in an Invalid state</ErrorDescription>
-                  </task:InvalidReason>              
+                  </task:InvalidReason>
                 </HI1Object>
              </GETResponse>
           </ActionResponse>
       </ActionResponses>
-    </ResponsePayload>  
+    </ResponsePayload>
   </Payload>
 </HI1Message>
diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml
index e210444..32bfcd1 100644
--- a/103120/examples/response5.xml
+++ b/103120/examples/response5.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" 
-            xmlns:xs="xmlns:xs=http://www.w3.org/2001/XMLSchema" 
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-            xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" 
-            xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" 
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core"
+            xmlns:xs="xmlns:xs=http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task"
+            xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery"
             xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">
   <Header>
     <SenderIdentifier>
diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd
index bebc3a3..abaf323 100644
--- a/103120/schema/ts_103120_Common.xsd
+++ b/103120/schema/ts_103120_Common.xsd
@@ -36,9 +36,8 @@
 		<xs:sequence>
 			<xs:element name="ApproverName" type="etsi:LongString" minOccurs="0"></xs:element>
 			<xs:element name="ApproverRole" type="etsi:LongString" minOccurs="0"></xs:element>
-			<xs:element name="ApproverEmailAddress" type="etsi:EmailAddress" minOccurs="0"></xs:element>
-			<xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"></xs:element>
 			<xs:element name="ApproverIdentity" type="ApproverIdentity" minOccurs="0"></xs:element>
+			<xs:element name="ApproverContactDetails" type="ApproverContactDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ApproverIdentity">
@@ -46,6 +45,14 @@
 			<xs:element name="NationalApproverIdentity" type="NationalApproverIdentity"></xs:element>
 		</xs:choice>
 	</xs:complexType>
+	<xs:complexType name="ApproverContactDetails">
+		<xs:sequence>
+			<xs:element name="ApproverAlternateName" type="etsi:LongString" minOccurs="0"></xs:element>
+			<xs:element name="ApproverEmailAddress" type="etsi:InternationalizedEmailAddress" minOccurs="0"></xs:element>
+			<xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"></xs:element>
+		</xs:sequence>
+	</xs:complexType>
+
 	<xs:complexType name="NationalApproverIdentity" abstract="true">
 		<xs:sequence>
 			<xs:element name="CountryCode" type="etsi:ISOCountryCode"></xs:element>
diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd
index af1674d..1105f2c 100644
--- a/103120/schema/ts_103120_Core.xsd
+++ b/103120/schema/ts_103120_Core.xsd
@@ -2,7 +2,7 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
            xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
-           xmlns:digsig="http://www.w3.org/2000/09/xmldsig#"		   
+           xmlns:digsig="http://www.w3.org/2000/09/xmldsig#"
            xmlns="http://uri.etsi.org/03120/common/2019/10/Core"
            targetNamespace="http://uri.etsi.org/03120/common/2019/10/Core"
            elementFormDefault="qualified"
-- 
GitLab


From 3b2deac00ea1b51236706572de8527f78fa7e207 Mon Sep 17 00:00:00 2001
From: SvS <239-svs@users.noreply.forge.etsi.org>
Date: Fri, 22 Oct 2021 11:21:07 +0200
Subject: [PATCH 3/3] - Fix editorial and indentation in examples/request3.xml

---
 103120/examples/request3.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml
index 451cf94..c93bb7a 100644
--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -39,15 +39,15 @@
                 </doc:DocumentType>
                 <doc:DocumentSignature>
                   <common:ApproverDetails>
-                    <common:ApproverName>Approver</common:ApproverName>
+                    <common:ApproverName>John Doe</common:ApproverName>
                     <common:ApproverContactDetails>
-                     <common:ApproverEmailAddress>john.doe@example.com</common:ApproverEmailAddress>
-                     <common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>
+                      <common:ApproverEmailAddress>john.doe@example.com</common:ApproverEmailAddress>
+                      <common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>
                     </common:ApproverContactDetails>
                     <common:ApproverContactDetails>
-                     <common:ApproverAlternateName>Jane Doe</common:ApproverAlternateName>
-                     <common:ApproverEmailAddress>jane.doe@example.com</common:ApproverEmailAddress>
-                     <common:ApproverPhoneNumber>442079461110</common:ApproverPhoneNumber>
+                      <common:ApproverAlternateName>Jane Doe</common:ApproverAlternateName>
+                      <common:ApproverEmailAddress>jane.doe@example.com</common:ApproverEmailAddress>
+                      <common:ApproverPhoneNumber>442079461110</common:ApproverPhoneNumber>
                     </common:ApproverContactDetails>
                   </common:ApproverDetails>
                   <common:ApprovalTimestamp>2015-09-01T12:00:00Z</common:ApprovalTimestamp>
-- 
GitLab