Commit 9ee7dd13 authored by Peter Niblett's avatar Peter Niblett

Move to using m2m:listOfURIs

parent 6b8b18cc
......@@ -88,7 +88,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- TODO: Update TS0004 to match this (needs CR) -->
<xs:complexType name="accessControlRule">
<xs:sequence>
<xs:element name="accessControlOriginators" type="m2m:AnyURIList" />
<xs:element name="accessControlOriginators" type="m2m:listOfURIs" />
<xs:element name="accessControlOperations" type="m2m:accessControlOperationList" />
<xs:element name="accessControlContexts" type="m2m:accessControlContexts" minOccurs="0" />
</xs:sequence>
......
......@@ -41,8 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="areaNwkId" type="xs:anyURI" />
<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="Status" type="xs:string" minOccurs="0" />
<xs:element name="listOfNeighbors" type="m2m:AnyURIList" />
<xs:element name="status" type="xs:string" minOccurs="0" />
<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......
......@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="areaNwkType" type="xs:string" />
<xs:element name="listOfDevices" type="m2m:AnyURIList" />
<xs:element name="listOfDevices" type="m2m:listOfURIs" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......
......@@ -112,16 +112,10 @@ 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" />
</xs:sequence>
</xs:complexType>
<!-- <xs:simpleType name="attribute"> -->
<!-- <xs:restriction base="xs:string" /> -->
......@@ -158,7 +152,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent>
<xs:extension base="m2m:regularResource">
<xs:sequence>
<xs:element name="announceTo" type="m2m:AnyURIList" minOccurs="0" />
<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="announcedAttribute" minOccurs="0">
<xs:simpleType>
<xs:list itemType="xs:token" />
......@@ -187,7 +181,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:resource">
<xs:sequence>
<xs:element name="expirationTime" type="xs:dateTime" />
<xs:element name="announceTo" type="m2m:AnyURIList" minOccurs="0" />
<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="announcedAttribute" minOccurs="0">
<xs:simpleType>
<xs:list itemType="xs:token" />
......@@ -214,8 +208,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableResource">
<xs:sequence>
<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" />
<xs:element name="objectIDs" type="m2m:AnyURIList" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:AnyURIList" minOccurs="0" />
<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:extension>
......@@ -227,8 +221,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource">
<xs:sequence>
<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" />
<xs:element name="objectIDs" type="m2m:AnyURIList" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:AnyURIList" minOccurs="0" />
<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:extension>
......
......@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="version" type="xs:string" />
<xs:element name="name" type="m2m:AnyURIList" />
<xs:element name="name" type="m2m:listOfURIs" />
<xs:element name="URL" type="xs:anyURI" />
<xs:element name="install" type="xs:boolean" minOccurs="0" />
<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
......
......@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="eventNotificationCriteria" type="m2m:eventNotificationCriteria" minOccurs="0" />
<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="notificationURI" type="m2m:AnyURIList" />
<xs:element name="notificationURI" type="m2m:listOfURIs" />
<xs:element name="groupID" type="xs:anyURI" minOccurs="0" />
<xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0" />
<xs:element name="batchNotify" type="m2m:batchNotify" minOccurs="0" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment