From 9726d2dccf155727f65d83e9fc068ed05635a6ed Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wolfgang.granzow@t-online.de>
Date: Fri, 1 Feb 2019 01:35:32 +0100
Subject: [PATCH] Changes agreed at PRO#38/TP#38 for Rel-2

See deteiled list of changes in PRO-2019-0001-PRO38_changes_of_XML_schemas_to_align_with_TS-0004
---
 v2_20_0/CDT-commonTypes-v2_20_0.xsd      | 4 ++--
 v2_20_0/CDT-delivery-v2_20_0.xsd         | 2 +-
 v2_20_0/CDT-enumerationTypes-v2_20_0.xsd | 4 +++-
 v2_20_0/CDT-request-v2_20_0.xsd          | 2 +-
 v2_20_0/CDT-requestPrimitive-v2_20_0.xsd | 4 ++--
 v2_20_0/CDT-timeSeries-v2_20_0.xsd       | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/v2_20_0/CDT-commonTypes-v2_20_0.xsd b/v2_20_0/CDT-commonTypes-v2_20_0.xsd
index 9cac368..5ac40d1 100644
--- a/v2_20_0/CDT-commonTypes-v2_20_0.xsd
+++ b/v2_20_0/CDT-commonTypes-v2_20_0.xsd
@@ -491,9 +491,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
 			<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
 			<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
-			<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" />
+			<xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" />
 			<xs:element name="roleIDs" minOccurs="0">      
-				<xs:simpleType>
+				<xs:simpleType> 
 					<xs:restriction> 
 						<xs:simpleType> 
 							<xs:list itemType="m2m:roleID" /> 
diff --git a/v2_20_0/CDT-delivery-v2_20_0.xsd b/v2_20_0/CDT-delivery-v2_20_0.xsd
index d1cc8c7..0ac651c 100644
--- a/v2_20_0/CDT-delivery-v2_20_0.xsd
+++ b/v2_20_0/CDT-delivery-v2_20_0.xsd
@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="source" type="m2m:ID" />
 						<xs:element name="target" type="m2m:ID" />
diff --git a/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd b/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd
index bcac57c..6467b4e 100644
--- a/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd
+++ b/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd
@@ -242,7 +242,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:simpleType name="discResType">
+	<xs:simpleType name="desIdResType">
 		<xs:annotation>
 			<xs:documentation>Used in &lt;request&gt; </xs:documentation>
 		</xs:annotation>
@@ -319,6 +319,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="4116" />    
 			<!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
 			<xs:enumeration value="4117" />    
+			<!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
+			<xs:enumeration value="4124" />    
 			<!-- INTERNAL_SERVER_ERROR     -->
             <xs:enumeration value="5000" />              
             <!-- NOT_IMPLEMENTED           -->
diff --git a/v2_20_0/CDT-request-v2_20_0.xsd b/v2_20_0/CDT-request-v2_20_0.xsd
index ea27618..7bda956 100644
--- a/v2_20_0/CDT-request-v2_20_0.xsd
+++ b/v2_20_0/CDT-request-v2_20_0.xsd
@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="operation" type="m2m:operation" />
 						<xs:element name="target" type="xs:anyURI" />
diff --git a/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd b/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd
index 8314260..4996a1d 100644
--- a/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd
+++ b/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd
@@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>        
           <!-- parameter "Filter Criteria" -->
           <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
-          <!-- parameter "Discovery Result Type" -->
-          <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
+          <!-- parameter "Desired Identifier Result Type" -->
+          <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
           <!-- parameter "Tokens" -->
           <xs:element name="tokens" minOccurs="0">
             <xs:simpleType>
diff --git a/v2_20_0/CDT-timeSeries-v2_20_0.xsd b/v2_20_0/CDT-timeSeries-v2_20_0.xsd
index ce15cbf..10b13e7 100644
--- a/v2_20_0/CDT-timeSeries-v2_20_0.xsd
+++ b/v2_20_0/CDT-timeSeries-v2_20_0.xsd
@@ -38,8 +38,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:announceableResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 						<xs:element name="creator" type="m2m:ID" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
@@ -74,7 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:announcedResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-- 
2.18.1