Commit 418b97415931f456743dfa2289ac1d9046967664

Authored by Wolfgang Granzow
1 parent d1c40a52

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
... ... @@ -875,7 +875,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
875 875  
876 876 <xs:complexType name="missingData">
877 877 <xs:sequence>
878   - <xs:element name="number" type="xs:nonNegativeInteger" minOccurs="1" />
  878 + <xs:element name="number" type="xs:positiveInteger" minOccurs="1" />
879 879 <xs:element name="duration" type="xs:duration" minOccurs="1" />
880 880 </xs:sequence>
881 881 </xs:complexType>
... ...
... ... @@ -36,7 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
36 36 <xs:sequence>
37 37 <!-- Resource Specific Attributes -->
38 38 <xs:element name="dynamicAuthorizationEnabled" type="xs:boolean" />
39   - <xs:element name="dynamicAuthorizationPoA" type="m2m:listOfURIs" />
  39 + <xs:element name="dynamicAuthorizationPoA" type="m2m:poaList" />
40 40 <xs:element name="dynamicAuthorizationLifetime" type="m2m:timestamp" minOccurs="0" />
41 41  
42 42 <!-- This Resource Type has no Child Resources -->
... ...
... ... @@ -350,7 +350,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
350 350 <!-- ESPRIM_ENCRYPTION_ERROR -->
351 351 <xs:enumeration value="5211" />
352 352 <!-- ESPRIM_ENCRYPTION_ERROR -->
353   - <xs:enumeration value="5212" />
  353 + <xs:enumeration value="5212" />
  354 +
  355 + <!-- UNABLE_TO_REPLACE_REQUEST -->
  356 + <xs:enumeration value="5219" />
  357 + <!-- UNABLE_TO_RECALL_REQUEST -->
  358 + <xs:enumeration value="5220" />
354 359 <!-- SPARQL_UPDATE_ERROR -->
355 360 <xs:enumeration value="6003" />
356 361 <!-- EXTERNAL_OBJECT_NOT_FOUND -->
... ... @@ -1047,6 +1052,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1047 1052 </xs:restriction>
1048 1053 </xs:simpleType>
1049 1054  
  1055 + <xs:simpleType name="filterOperation">
  1056 + <xs:restriction base="xs:integer">
  1057 + <!-- Logical AND -->
  1058 + <xs:enumeration value="1" />
  1059 + <!-- Logical OR -->
  1060 + <xs:enumeration value="2" />
  1061 + </xs:restriction>
  1062 + </xs:simpleType>
  1063 +
1050 1064 <!-- m2m:securityInfoType is defined in the CDT-notification xsd file -->
1051 1065  
1052 1066  
... ...
... ... @@ -85,6 +85,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
85 85 <xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
86 86 <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
87 87 <xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
  88 + <xs:element name="filterOperation" type="m2m:filterOperation" minOccurs="0" />
88 89 </xs:sequence>
89 90 </xs:complexType>
90 91  
... ...
... ... @@ -46,12 +46,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
46 46 <xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
47 47 <xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
48 48 <xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
49   - <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
  49 + <xs:element name="periodicInterval" type="xs:positiveInteger" minOccurs="0" />
50 50 <xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
51   - <xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
  51 + <xs:element name="missingDataMaxNr" type="xs:positiveInteger" minOccurs="0" />
52 52 <xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
53 53 <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
54   - <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
  54 + <xs:element name="missingDataDetectTimer" type="xs:positiveInteger" minOccurs="0" />
55 55 <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
56 56  
57 57 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -81,11 +81,11 @@ 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="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
  84 + <xs:element name="periodicInterval" type="xs:positiveInteger" minOccurs="0" />
  85 + <xs:element name="missingDataMaxNr" type="xs:positiveInteger" 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   - <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
  88 + <xs:element name="missingDataDetectTimer" type="xs:positiveInteger" minOccurs="0" />
89 89 <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
90 90  
91 91 <!-- Child Resources -->
... ...