diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd index b4ac05d098da09b530be3724da73b58d41d190a7..2383dc50baf4bc01c7d3d985fbdbfe5cdb67bc3c 100644 --- a/CDT-commonTypes-v0_8_0.xsd +++ b/CDT-commonTypes-v0_8_0.xsd @@ -96,6 +96,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:simpleContent> </xs:complexType> + <!-- TODO: decide which of these two we prefer and use it consistently --> + <xs:simpleType name="listOfURIs"> + <list itemType="xs:anyURI" /> + </xs:simpleType> + <xs:complexType name="AnyURIList"> <xs:sequence> <xs:element name="reference" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" /> @@ -422,51 +427,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="description" type="m2m:eventCatType" /> </xs:sequence> </xs:complexType> - - <!-- 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: 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 --> - <xs:simpleType name="longMin-1"> - <xs:restriction base="xs:long"> - <xs:minInclusive value="-1" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="listOflongMin-1"> - <xs:list itemType="m2m:longMin-1" /> - </xs:simpleType> - - <xs:simpleType name="listOfMinMax"> - <xs:restriction base="m2m:listOflongMin-1" > - <xs:minLength value="2" /> - <xs:maxLength value="2" /> - </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 --> - <xs:simpleType name="listOfNonNegInt"> - <xs:list itemType="xs:nonNegativeInteger" /> - </xs:simpleType> - - <xs:simpleType name="backOffParameters"> - <xs:restriction base="m2m:listOfNonNegInt" > - <xs:minLength value="3" /> - <xs:maxLength value="3" /> - </xs:restriction> - </xs:simpleType> - - <!-- TODO: check if "eventCatType" is the correct base type for the list elements or if data type "eventCat" should be used here --> - <!-- "listOfEventCat" is a space separated list of eventCatType's --> - <xs:simpleType name="listOfEventCat"> - <xs:list itemType="m2m:eventCatType" /> - </xs:simpleType> - </xs:schema>