Commit 76063b59c307562aef714179336f4b190b7226f0

Authored by Wolfgang Granzow
1 parent 8629dc08

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

See PRO-2018-0197 for the detailed list of changes.
... ... @@ -327,8 +327,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
327 327  
328 328 <xs:simpleType name="scheduleEntry">
329 329 <xs:restriction base="xs:string">
330   - <xs:pattern
331   - 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])?)*))" />
  330 + <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))" />
332 331 </xs:restriction>
333 332 </xs:simpleType>
334 333  
... ...
... ... @@ -282,7 +282,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
282 282 <!-- OPERATION_NOT_ALLOWED -->
283 283 <xs:enumeration value="4005" />
284 284 <!-- REQUEST_TIMEOUT -->
285   - <xs:enumeration value="4008" />
  285 + <xs:enumeration value="4008" />
  286 + <!-- UNSUPPORTED_MEDIA_TYPE -->
  287 + <xs:enumeration value="4015" />
286 288 <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
287 289 <xs:enumeration value="4101" />
288 290 <!-- CONTENTS_UNACCEPTABLE -->
... ... @@ -333,7 +335,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
333 335 <xs:enumeration value="5204" />
334 336 <!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE -->
335 337 <xs:enumeration value="5205" />
336   - <!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED -->
  338 + <!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED -->
337 339 <xs:enumeration value="5206" />
338 340 <!-- NOT_ACCEPTABLE -->
339 341 <xs:enumeration value="5207" />
... ... @@ -387,7 +389,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
387 389 <!-- PENDING -->
388 390 <xs:enumeration value="3" />
389 391 <!-- FORWARDED -->
390   - <xs:enumeration value="4" />
  392 + <xs:enumeration value="4" />
  393 + <!-- PARTIALLY_COMPLETED -->
  394 + <xs:enumeration value="5" />
391 395 </xs:restriction>
392 396 </xs:simpleType>
393 397  
... ...
... ... @@ -57,6 +57,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
57 57 minOccurs="0"/>
58 58 <xs:element name="groupName" type="xs:string" minOccurs="0"/>
59 59 <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
  60 + <xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
60 61  
61 62 <!-- Child Resources -->
62 63 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -96,6 +97,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
96 97 minOccurs="0"/>
97 98 <xs:element name="groupName" type="xs:string" minOccurs="0"/>
98 99 <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
  100 + <xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
99 101  
100 102 <!-- Child Resources -->
101 103 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -41,7 +41,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
41 41 <xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
42 42 <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
43 43 <xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
44   - <xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
  44 + <xs:element name="locationContainerID" type="xs:anyURI" />
45 45 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
46 46 <xs:element name="locationStatus" type="xs:string" />
47 47  
... ...
... ... @@ -81,8 +81,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
81 81 <xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
82 82 <xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
83 83 <xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
84   - <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
85   - <xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
  84 + <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
  85 + <xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
86 86 <xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
87 87 <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
88 88 <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
... ...