From 5af35eef7c2b21ef3fddeae1972c2f34e88b8092 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Mon, 15 Jun 2020 12:30:51 +0100
Subject: [PATCH] TS 102 657 v1.16.1 (2014-10-24) agreed at LI#37 (Lecce,
 2014-09-23)

---
 102657/RDMessage.asn                            | 17 +++++++++++++++--
 102657/RDMessage.xsd                            | 15 ++++++++++++---
 .../{RDMessagever15.txt => RDMessagever16.txt}  | 17 +++++++++++++++--
 .../{RDMessage,ver15.xsd => RDMessagever16.xsd} | 15 ++++++++++++---
 4 files changed, 54 insertions(+), 10 deletions(-)
 rename 102657/portal/{RDMessagever15.txt => RDMessagever16.txt} (99%)
 rename 102657/portal/{RDMessage,ver15.xsd => RDMessagever16.xsd} (99%)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index cd26c72..2b94172 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -12,7 +12,7 @@ BEGIN
 retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
 
 -- rdHeader
-rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version16(16)}
 
 
 -- ======================================
@@ -233,9 +233,22 @@ FurtherInformation ::= SEQUENCE
 {
 	information			[1] UTF8String,
 	contactInformation	[2] UTF8String OPTIONAL,
+	...,
+	categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4
+}
+
+
+CategorisedErrorDescription ::= SEQUENCE
+{
+	value				[1] INTEGER,
+	description			[2] UTF8String OPTIONAL,
 	...
 }
 
+
+
+
+
 -- ===================================================
 -- Definitions of a cancel message and acknowledgement
 -- ===================================================
diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 081f77e..2ec34b4 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
-            targetNamespace="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
+            xmlns="http://uri.etsi.org/02657/v1.16.1#/RetainedData"
+            targetNamespace="http://uri.etsi.org/02657/v1.16.1#/RetainedData"
 			elementFormDefault="qualified">
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 
+			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 
 		</xsd:documentation>
 	</xsd:annotation>
 
@@ -2235,6 +2235,15 @@
       <xsd:sequence>
          <xsd:element name="information" type="xsd:string"/>
          <xsd:element name="contactInformation" minOccurs="0" type="xsd:string"/>
+         <xsd:element name="categorisedErrorDescription" minOccurs="0" type="CategorisedErrorDescription"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <xsd:complexType name="CategorisedErrorDescription">
+      <xsd:sequence>
+         <xsd:element name="value" type="xsd:integer"/>
+         <xsd:element name="description" minOccurs="0"  type="xsd:string"/>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
diff --git a/102657/portal/RDMessagever15.txt b/102657/portal/RDMessagever16.txt
similarity index 99%
rename from 102657/portal/RDMessagever15.txt
rename to 102657/portal/RDMessagever16.txt
index cd26c72..2b94172 100644
--- a/102657/portal/RDMessagever15.txt
+++ b/102657/portal/RDMessagever16.txt
@@ -1,4 +1,4 @@
-RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)}
+RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -12,7 +12,7 @@ BEGIN
 retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
 
 -- rdHeader
-rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)}
+rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version16(16)}
 
 
 -- ======================================
@@ -233,9 +233,22 @@ FurtherInformation ::= SEQUENCE
 {
 	information			[1] UTF8String,
 	contactInformation	[2] UTF8String OPTIONAL,
+	...,
+	categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4
+}
+
+
+CategorisedErrorDescription ::= SEQUENCE
+{
+	value				[1] INTEGER,
+	description			[2] UTF8String OPTIONAL,
 	...
 }
 
+
+
+
+
 -- ===================================================
 -- Definitions of a cancel message and acknowledgement
 -- ===================================================
diff --git a/102657/portal/RDMessage,ver15.xsd b/102657/portal/RDMessagever16.xsd
similarity index 99%
rename from 102657/portal/RDMessage,ver15.xsd
rename to 102657/portal/RDMessagever16.xsd
index 081f77e..2ec34b4 100644
--- a/102657/portal/RDMessage,ver15.xsd
+++ b/102657/portal/RDMessagever16.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
-            targetNamespace="http://uri.etsi.org/02657/v1.15.1#/RetainedData"
+            xmlns="http://uri.etsi.org/02657/v1.16.1#/RetainedData"
+            targetNamespace="http://uri.etsi.org/02657/v1.16.1#/RetainedData"
 			elementFormDefault="qualified">
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 
+			XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 
 		</xsd:documentation>
 	</xsd:annotation>
 
@@ -2235,6 +2235,15 @@
       <xsd:sequence>
          <xsd:element name="information" type="xsd:string"/>
          <xsd:element name="contactInformation" minOccurs="0" type="xsd:string"/>
+         <xsd:element name="categorisedErrorDescription" minOccurs="0" type="CategorisedErrorDescription"/>
+         <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <xsd:complexType name="CategorisedErrorDescription">
+      <xsd:sequence>
+         <xsd:element name="value" type="xsd:integer"/>
+         <xsd:element name="description" minOccurs="0"  type="xsd:string"/>
          <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
       </xsd:sequence>
    </xsd:complexType>
-- 
GitLab