Changes agreed at PRO#35/TP#35 for Rel-2

See PRO-2018-0197 for the detailed list of changes.

v2_18_0/CDT-commonTypes-v2_18_0.xsd

@@ -327,8 +327,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:simpleType name="scheduleEntry">
 		<xs:restriction base="xs:string">
-			<xs:pattern
-				value="(([*]|[1-5]?\d([,\-/][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,\-/](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,\-/]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,\-/]([1-9]|1[0-2]))*))\s+([*]|([0-6]([,\-/][0-6])*))\s+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]?[\d]?[\d]?[\d])?)*))" /> 				
+			<xs:pattern value="(((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?|([1-5]?\d))\,)*((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?)|([1-5]?\d))\s+){2}((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?|(1?\d|2[0-3]))\,)*((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?)|(1?\d|2[0-3]))\s+((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?|([1-9]|1\d|2\d|3[01]))\,)*((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?)|([1-9]|1\d|2\d|3[01]))\s+((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?|([1-9]|1[0-2]))\,)*((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?)|([1-9]|1[0-2]))\s+((([*]|(([0-6])\-([0-6])))(\/[0-6])?|([0-6]))\,)*((([*]|(([0-6])\-([0-6])))(\/[0-6])?)|([0-6]))\s+((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?|([2-9]\d\d\d))\,)*((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?)|([2-9]\d\d\d))" />
 		</xs:restriction>
 	</xs:simpleType>
 

v2_18_0/CDT-enumerationTypes-v2_18_0.xsd

@@ -282,7 +282,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <!-- OPERATION_NOT_ALLOWED  -->
             <xs:enumeration value="4005" />            
             <!-- REQUEST_TIMEOUT  -->
-            <xs:enumeration value="4008" />            
+            <xs:enumeration value="4008" />
+			<!-- UNSUPPORTED_MEDIA_TYPE  -->
+			<xs:enumeration value="4015" />
             <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
             <xs:enumeration value="4101" />            
             <!-- CONTENTS_UNACCEPTABLE  -->
@@ -333,7 +335,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:enumeration value="5204" />            
             <!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE     -->
             <xs:enumeration value="5205" />            
-            <!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED     -->
+			<!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED     -->
             <xs:enumeration value="5206" />    
 			<!-- NOT_ACCEPTABLE                         -->
 			<xs:enumeration value="5207" />
@@ -387,7 +389,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <!-- PENDING -->
             <xs:enumeration value="3" />
             <!-- FORWARDED -->
-            <xs:enumeration value="4" />
+            <xs:enumeration value="4" />      	
+        	<!-- PARTIALLY_COMPLETED -->
+        	<xs:enumeration value="5" />
         </xs:restriction>
 	</xs:simpleType>
 

v2_18_0/CDT-group-v2_18_0.xsd

@@ -57,6 +57,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 							minOccurs="0"/>
 						<xs:element name="groupName" type="xs:string" minOccurs="0"/>
 						<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
@@ -96,6 +97,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 							minOccurs="0"/>
 						<xs:element name="groupName" type="xs:string" minOccurs="0"/>
 						<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">

v2_18_0/CDT-locationPolicy-v2_18_0.xsd

@@ -41,7 +41,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
 						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
+						<xs:element name="locationContainerID" type="xs:anyURI" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
 						<xs:element name="locationStatus" type="xs:string" />
 

v2_18_0/CDT-timeSeries-v2_18_0.xsd

@@ -81,8 +81,8 @@ 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="missingDataDetect" type="xs:boolean" minOccurs="0" />  
+						<xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />  
+						<xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" 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" />