diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index a8119fecf2df6b6375b4c774ee8d69362f48949a..02e24029435989b15905b00f14f23c1fe059f468 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -80,21 +80,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:list itemType="xs:string" />
</xs:simpleType>
- <!-- TODO: Not sure who uses this -->
+ <!-- TODO: this data type is not used in any of the XSD files. It is listed in TS-004 without any given use case -->
<xs:simpleType name="networkaccessID">
<xs:restriction base="xs:token">
</xs:restriction>
</xs:simpleType>
- <!-- TODO: check if m2m:ID is the correct data type for the following list elements or if xs:anyURI should be used (as used
- in access control rules) -->
<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID" -->
<xs:simpleType name="listOfM2MID">
<xs:list itemType="m2m:ID" />
</xs:simpleType>
-
- <!-- TODO: Fix these -->
<xs:simpleType name="eventCat">
<xs:union memberTypes="m2m:stdEventCats " />
</xs:simpleType>
@@ -111,20 +107,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<list itemType="m2m:eventCatWithDef" />
</xs:simpleType>
- <!-- TODO: check if the definition of "listOfMinMax" can be simplified, i.e. avoiding use of explicit type definitions for
- "longMin-1" and "listOflongMin-1" -->
- <!-- "listOfMinMax" represents a list of min and max numbers used in attributes of the [cmdhLimits] resource based on data
- type longMin-1. Unit is milliseconds -->
+ <!-- auxiliary data type required to define "listOflongMin-1" below -->
<xs:simpleType name="longMin-1">
<xs:restriction base="xs:long">
<xs:minInclusive value="-1" />
</xs:restriction>
</xs:simpleType>
+ <!-- auxiliary data type required to define "listOfMinMax" below -->
<xs:simpleType name="listOflongMin-1">
<xs:list itemType="m2m:longMin-1" />
</xs:simpleType>
+ <!-- "listOfMinMax" represents a list of min and max numbers used in attributes of the [cmdhLimits] resource based on
+ type xs:long in the range -1, 0, 1, 2 ... . Unit is milliseconds. Value setting of -1 expresses infinity -->
<xs:simpleType name="listOfMinMax">
<xs:restriction base="m2m:listOflongMin-1">
<xs:minLength value="2" />
@@ -132,15 +128,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
-
- <!-- TODO: check if the definition of "backOffParameters" can be simplified, i.e. avoiding use of explicit type definition
- for "listOfNonNegInt" -->
- <!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers:backoffTime, backoffTimeIncrement, maximumBackoffTime
- (in that order!), all units in milliseconds -->
+ <!-- auxiliary data type required to define "listOfMinMax" below -->
<xs:simpleType name="listOfNonNegInt">
<xs:list itemType="xs:nonNegativeInteger" />
</xs:simpleType>
+ <!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers: backoffTime, backoffTimeIncrement, maximumBackoffTime
+ (in that order!), all units in milliseconds -->
<xs:simpleType name="backOffParameters">
<xs:restriction base="m2m:listOfNonNegInt">
<xs:minLength value="3" />
@@ -302,7 +296,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
- <!-- TODO: - TS-0004 calls the member elements "name" and "type", but name and value seems more appropriate -->
+ <!-- TODO: TS-0004 calls the member elements "name" and "type", but name and value seems more appropriate -->
<xs:complexType name="anyArgType">
<xs:sequence>
<xs:element name="name" type="xs:NCName" />
@@ -381,7 +375,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
<!-- TODO: - TS-0004 also shows an anyArg option, but this isn't compatible with the cmdType, so has been omitted -->
-
<xs:complexType name="execReqArgsListType">
<xs:choice>
<xs:element name="reset" type="m2m:resetArgsType" maxOccurs="unbounded" />
@@ -424,7 +417,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
- <!-- TODO: is this a sensible order? -->
+ <!-- TODO: order of elements should be aligned with the one in responsePrimitive -->
<xs:complexType name="operationResult">
<xs:sequence>
<xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd
index 14920fb92b414004990fdd3c67b55dcccab5234e..5968d1d48d7f3e6e51d6b41cd24f572452685e18 100644
--- a/CDT-enumerationTypes-v0_8_0.xsd
+++ b/CDT-enumerationTypes-v0_8_0.xsd
@@ -218,7 +218,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <!-- TODO: to be added) -->
+ <!-- TODO: alignment of TS-0004 still needed: m2m:responseStatusCode should replace any remaining occurences of m2m:responseStatus -->
<xs:simpleType name="responseStatusCode">
<xs:annotation>
<xs:documentation></xs:documentation>
@@ -242,7 +242,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4005" />
<!-- REQUEST_TIMEOUT -->
<xs:enumeration value="4008" />
- <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE-->
+ <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
<xs:enumeration value="4101" />
<!-- CONTENTS_UNACCEPTABLE -->
<xs:enumeration value="4102" />
@@ -300,7 +300,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <!-- TODO: to be defined (needs CR) -->
<xs:simpleType name="requestStatus">
<xs:annotation>
<xs:documentation>Used for request Status in the <request> resource</xs:documentation>