From 9ee7dd139821cd7f40a67dbe01de7932be2e8410 Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Wed, 21 Jan 2015 03:36:45 +0000
Subject: [PATCH] Move to using m2m:listOfURIs
---
CDT-accessControlPolicy-v0_8_0.xsd | 2 +-
CDT-areaNwkDeviceInfo-v0_8_0.xsd | 4 ++--
CDT-areaNwkInfo-v0_8_0.xsd | 2 +-
CDT-commonTypes-v0_8_0.xsd | 18 ++++++------------
CDT-software-v0_8_0.xsd | 2 +-
CDT-subscription-v0_8_0.xsd | 2 +-
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/CDT-accessControlPolicy-v0_8_0.xsd b/CDT-accessControlPolicy-v0_8_0.xsd
index b2978ad..e329d85 100644
--- a/CDT-accessControlPolicy-v0_8_0.xsd
+++ b/CDT-accessControlPolicy-v0_8_0.xsd
@@ -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>
diff --git a/CDT-areaNwkDeviceInfo-v0_8_0.xsd b/CDT-areaNwkDeviceInfo-v0_8_0.xsd
index 7312aa0..bee5e46 100644
--- a/CDT-areaNwkDeviceInfo-v0_8_0.xsd
+++ b/CDT-areaNwkDeviceInfo-v0_8_0.xsd
@@ -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">
diff --git a/CDT-areaNwkInfo-v0_8_0.xsd b/CDT-areaNwkInfo-v0_8_0.xsd
index 18c0799..2f71b9a 100644
--- a/CDT-areaNwkInfo-v0_8_0.xsd
+++ b/CDT-areaNwkInfo-v0_8_0.xsd
@@ -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">
diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index 25d0b5e..fb47293 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -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>
diff --git a/CDT-software-v0_8_0.xsd b/CDT-software-v0_8_0.xsd
index b99f21c..edcbbd8 100644
--- a/CDT-software-v0_8_0.xsd
+++ b/CDT-software-v0_8_0.xsd
@@ -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" />
diff --git a/CDT-subscription-v0_8_0.xsd b/CDT-subscription-v0_8_0.xsd
index 00603cb..ac1f502 100644
--- a/CDT-subscription-v0_8_0.xsd
+++ b/CDT-subscription-v0_8_0.xsd
@@ -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" />
--
GitLab