From c7f85b9e720161c480b37929fda7c6e8a641ee20 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Fri, 15 Apr 2016 13:00:42 +0200
Subject: [PATCH] Release-1 changes agreed at TP#22
See detailed list of changes in document
PRO-2016-0141-PRO22_changes_of_XML_schemas_to_align_with_TS-0004
---
v1_7_0/CDT-commonTypes-v1_7_0.xsd | 20 +++++++++++++++++++-
v1_7_0/CDT-pollingChannel-v1_7_0.xsd | 2 +-
v1_7_0/CDT-responsePrimitive-v1_7_0.xsd | 2 +-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/v1_7_0/CDT-commonTypes-v1_7_0.xsd b/v1_7_0/CDT-commonTypes-v1_7_0.xsd
index 18125e6..2a13950 100644
--- a/v1_7_0/CDT-commonTypes-v1_7_0.xsd
+++ b/v1_7_0/CDT-commonTypes-v1_7_0.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/v1_7_0/CDT-pollingChannel-v1_7_0.xsd b/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
index 0113d43..fc8c458 100644
--- a/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
+++ b/v1_7_0/CDT-pollingChannel-v1_7_0.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/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd b/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
index 99c7111..a9bcb78 100644
--- a/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
+++ b/v1_7_0/CDT-responsePrimitive-v1_7_0.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>
--
GitLab