diff --git a/v2_20_0/CDT-commonTypes-v2_20_0.xsd b/v2_20_0/CDT-commonTypes-v2_20_0.xsd index 9cac368b1ded0d2f0d0680cff6c60b483b0e6285..5ac40d19235d3f278b90411a364ea161894b3e10 100644 --- a/v2_20_0/CDT-commonTypes-v2_20_0.xsd +++ b/v2_20_0/CDT-commonTypes-v2_20_0.xsd @@ -491,9 +491,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" /> + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" /> <xs:element name="roleIDs" minOccurs="0"> - <xs:simpleType> + <xs:simpleType> <xs:restriction> <xs:simpleType> <xs:list itemType="m2m:roleID" /> diff --git a/v2_20_0/CDT-delivery-v2_20_0.xsd b/v2_20_0/CDT-delivery-v2_20_0.xsd index d1cc8c761e9215eda8d3a237e3c51176255ae09f..0ac651c023f21946991f8b0d0626daf988848466 100644 --- a/v2_20_0/CDT-delivery-v2_20_0.xsd +++ b/v2_20_0/CDT-delivery-v2_20_0.xsd @@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:regularResource"> <xs:sequence> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> - <xs:element name="stateTag" type="xs:nonNegativeInteger" /> + <!-- Resource Specific Attributes --> <xs:element name="source" type="m2m:ID" /> <xs:element name="target" type="m2m:ID" /> diff --git a/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd b/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd index bcac57cb29a8dc7dbaf3a72995d130a9edd07273..6467b4ef1dc4b680f95ca327eede515297020737 100644 --- a/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd +++ b/v2_20_0/CDT-enumerationTypes-v2_20_0.xsd @@ -242,7 +242,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <xs:simpleType name="discResType"> + <xs:simpleType name="desIdResType"> <xs:annotation> <xs:documentation>Used in <request> </xs:documentation> </xs:annotation> @@ -319,6 +319,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="4116" /> <!-- ORIGINATOR_HAS_ALREADY_REGISTERED --> <xs:enumeration value="4117" /> + <!-- SPECIALIZATION_SCHEMA_NOT_FOUND --> + <xs:enumeration value="4124" /> <!-- INTERNAL_SERVER_ERROR --> <xs:enumeration value="5000" /> <!-- NOT_IMPLEMENTED --> diff --git a/v2_20_0/CDT-request-v2_20_0.xsd b/v2_20_0/CDT-request-v2_20_0.xsd index ea27618b2aabc16e2159280316a0ef8aa616e723..7bda95650205c41c3f14ec61329f2044571e742e 100644 --- a/v2_20_0/CDT-request-v2_20_0.xsd +++ b/v2_20_0/CDT-request-v2_20_0.xsd @@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:regularResource"> <xs:sequence> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> - <xs:element name="stateTag" type="xs:nonNegativeInteger" /> + <!-- Resource Specific Attributes --> <xs:element name="operation" type="m2m:operation" /> <xs:element name="target" type="xs:anyURI" /> diff --git a/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd b/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd index 83142608541ac3ecdb5e2ecc12256b5f2b97aab8..4996a1da223ba093de7a20507c22183e6c29a33b 100644 --- a/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd +++ b/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd @@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/> <!-- parameter "Filter Criteria" --> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/> - <!-- parameter "Discovery Result Type" --> - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/> + <!-- parameter "Desired Identifier Result Type" --> + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/> <!-- parameter "Tokens" --> <xs:element name="tokens" minOccurs="0"> <xs:simpleType> diff --git a/v2_20_0/CDT-timeSeries-v2_20_0.xsd b/v2_20_0/CDT-timeSeries-v2_20_0.xsd index ce15cbf97c3a5d6be2f7e78eb40b03fad2d09025..10b13e77d6e170de8b4ded00437bf5d10741f183 100644 --- a/v2_20_0/CDT-timeSeries-v2_20_0.xsd +++ b/v2_20_0/CDT-timeSeries-v2_20_0.xsd @@ -38,8 +38,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:announceableResource"> <xs:sequence> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources --> - <xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="creator" type="m2m:ID" /> + <!-- Resource Specific Attributes --> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <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 <xs:extension base="m2m:announcedResource"> <xs:sequence> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> - <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" /> + <!-- Resource Specific Attributes --> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />