diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index 8b71dba47b15dc5f162402ef12f5a78acaa53234..6b679a27247c66d6c941708a835bfbe176a10fed 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -258,6 +258,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <list itemType="xs:NCName" /> </xs:simpleType> + <xs:simpleType name="resourceTypeList"> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:resourceType" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> <!--********************** --> <!-- oneM2M Complex Types --> @@ -328,7 +336,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" /> <xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" /> <xs:element name="labels" type="m2m:labels" minOccurs="0" /> - <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" /> + <xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" /> <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" /> @@ -585,6 +593,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:extension> </xs:complexContent> </xs:complexType> + + <xs:complexType name="subordinateResource"> + <xs:complexContent> + <xs:extension base="m2m:resource"> + <xs:sequence> + <xs:element name="expirationTime" type="m2m:timestamp" /> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="announcedSubordinateResource"> <xs:complexContent> diff --git a/CDT-pollingChannel.xsd b/CDT-pollingChannel.xsd index 59264b0561f211f789f1af246c5512cfb041b96a..dd6b49893c98c06de30b503ad0e852c28fffe716 100644 --- a/CDT-pollingChannel.xsd +++ b/CDT-pollingChannel.xsd @@ -34,7 +34,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexType> <xs:complexContent> <!-- Inherit common attributes --> - <xs:extension base="m2m:regularResource"> + <xs:extension base="m2m:subordinateResource"> <xs:sequence> <!-- No Resource Specific Attributes --> diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd index 9bcbd03feb3c8c90b310e6035bdf6cb4140571d3..92169eeb999917e1a40324f2282409ccb9703966 100644 --- a/CDT-responsePrimitive.xsd +++ b/CDT-responsePrimitive.xsd @@ -155,7 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:statsConfig" /> <xs:element ref="m2m:subscription" /> </xs:choice> - <xs:element name="URIList" type="m2m:listOfURIs" /> + <xs:element name="URI" type="xs:anyURI" /> </xs:sequence> </xs:complexType>