Commit 9726d2dccf155727f65d83e9fc068ed05635a6ed

Authored by Wolfgang Granzow
1 parent 3ebb57b3

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
... ... @@ -491,9 +491,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
491 491 <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
492 492 <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
493 493 <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
494   - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" />
  494 + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" />
495 495 <xs:element name="roleIDs" minOccurs="0">
496   - <xs:simpleType>
  496 + <xs:simpleType>
497 497 <xs:restriction>
498 498 <xs:simpleType>
499 499 <xs:list itemType="m2m:roleID" />
... ...
... ... @@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
38 38 <xs:extension base="m2m:regularResource">
39 39 <xs:sequence>
40 40 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
41   - <xs:element name="stateTag" type="xs:nonNegativeInteger" />
  41 +
42 42 <!-- Resource Specific Attributes -->
43 43 <xs:element name="source" type="m2m:ID" />
44 44 <xs:element name="target" type="m2m:ID" />
... ...
... ... @@ -242,7 +242,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
242 242 </xs:restriction>
243 243 </xs:simpleType>
244 244  
245   - <xs:simpleType name="discResType">
  245 + <xs:simpleType name="desIdResType">
246 246 <xs:annotation>
247 247 <xs:documentation>Used in &lt;request&gt; </xs:documentation>
248 248 </xs:annotation>
... ... @@ -319,6 +319,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
319 319 <xs:enumeration value="4116" />
320 320 <!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
321 321 <xs:enumeration value="4117" />
  322 + <!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
  323 + <xs:enumeration value="4124" />
322 324 <!-- INTERNAL_SERVER_ERROR -->
323 325 <xs:enumeration value="5000" />
324 326 <!-- NOT_IMPLEMENTED -->
... ...
... ... @@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
37 37 <xs:extension base="m2m:regularResource">
38 38 <xs:sequence>
39 39 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
40   - <xs:element name="stateTag" type="xs:nonNegativeInteger" />
  40 +
41 41 <!-- Resource Specific Attributes -->
42 42 <xs:element name="operation" type="m2m:operation" />
43 43 <xs:element name="target" type="xs:anyURI" />
... ...
... ... @@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
79 79 <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>
80 80 <!-- parameter "Filter Criteria" -->
81 81 <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
82   - <!-- parameter "Discovery Result Type" -->
83   - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
  82 + <!-- parameter "Desired Identifier Result Type" -->
  83 + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
84 84 <!-- parameter "Tokens" -->
85 85 <xs:element name="tokens" minOccurs="0">
86 86 <xs:simpleType>
... ...
... ... @@ -38,8 +38,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
38 38 <xs:extension base="m2m:announceableResource">
39 39 <xs:sequence>
40 40 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
41   - <xs:element name="stateTag" type="xs:nonNegativeInteger" />
42 41 <xs:element name="creator" type="m2m:ID" />
  42 +
43 43 <!-- Resource Specific Attributes -->
44 44 <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
45 45 <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
74 74 <xs:extension base="m2m:announcedResource">
75 75 <xs:sequence>
76 76 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
77   - <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
  77 +
78 78 <!-- Resource Specific Attributes -->
79 79 <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
80 80 <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
... ...