Changes agreed at SDS#39/TP#39 for Rel-2

See detailed list of changes in SDS-2019-0188-SDS39_changes_of_XML_schemas_to_align_with_TS-0004

v2_21_0/CDT-commonTypes-v2_21_0.xsd

@@ -875,7 +875,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:complexType name="missingData">
 		<xs:sequence>
-			<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="1" />
+			<xs:element name="number" type="xs:positiveInteger" minOccurs="1" />
 			<xs:element name="duration" type="xs:duration" minOccurs="1" />
 		</xs:sequence>
 	</xs:complexType>

v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd

@@ -36,7 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<xs:element name="dynamicAuthorizationEnabled" type="xs:boolean" />
-						<xs:element name="dynamicAuthorizationPoA" type="m2m:listOfURIs" />
+						<xs:element name="dynamicAuthorizationPoA" type="m2m:poaList" />
 						<xs:element name="dynamicAuthorizationLifetime" type="m2m:timestamp" minOccurs="0" />
 
 						<!-- This Resource Type has no Child Resources -->

v2_21_0/CDT-enumerationTypes-v2_21_0.xsd

@@ -350,7 +350,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<!-- ESPRIM_ENCRYPTION_ERROR                -->
 			<xs:enumeration value="5211" />    
 			<!-- ESPRIM_ENCRYPTION_ERROR                -->
-			<xs:enumeration value="5212" />    
+			<xs:enumeration value="5212" />   
+			
+			<!-- UNABLE_TO_REPLACE_REQUEST              -->
+			<xs:enumeration value="5219" />   
+			<!-- UNABLE_TO_RECALL_REQUEST               -->
+			<xs:enumeration value="5220" />   
 			<!-- SPARQL_UPDATE_ERROR                    -->
             <xs:enumeration value="6003" />              
             <!-- EXTERNAL_OBJECT_NOT_FOUND              -->
@@ -1047,6 +1052,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 	
+	<xs:simpleType name="filterOperation">
+		<xs:restriction base="xs:integer">
+			<!-- Logical AND -->
+			<xs:enumeration value="1" />
+			<!-- Logical OR -->
+			<xs:enumeration value="2" />
+		</xs:restriction>
+	</xs:simpleType>
+	
 	<!-- m2m:securityInfoType is defined in the CDT-notification xsd file -->
 	
 	

v2_21_0/CDT-subscription-v2_21_0.xsd

@@ -85,6 +85,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
 			<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
 			<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
+			<xs:element name="filterOperation" type="m2m:filterOperation" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
 

v2_21_0/CDT-timeSeries-v2_21_0.xsd

@@ -46,12 +46,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
 						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />						
-						<xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="periodicInterval" type="xs:positiveInteger" minOccurs="0" />
 						<xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
-						<xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />  
+						<xs:element name="missingDataMaxNr" type="xs:positiveInteger" minOccurs="0" />  
 						<xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
 						<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />						
+						<xs:element name="missingDataDetectTimer" type="xs:positiveInteger" minOccurs="0" />						
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> 
 
 						<xs:choice minOccurs="0" maxOccurs="1">
@@ -81,11 +81,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
 						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />						
-						<xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />  
-						<xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
+						<xs:element name="periodicInterval" type="xs:positiveInteger" minOccurs="0" />  
+						<xs:element name="missingDataMaxNr" type="xs:positiveInteger" minOccurs="0" />
 						<xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
 						<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />						
+						<xs:element name="missingDataDetectTimer" type="xs:positiveInteger" minOccurs="0" />						
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> 
 
 						<!-- Child Resources -->