From 696ba8d32f891af8d2cf7f24e2f90abf07225df9 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Tue, 27 Jan 2015 16:08:33 +0100
Subject: [PATCH] Updates 2015-01-27 by Wolfgang

---
 CDT-CSEBase-v0_8_0.xsd         |  1 -
 CDT-commonTypes-v0_8_0.xsd     |  4 ++--
 CDT-container-v0_8_0.xsd       |  7 ++++---
 CDT-contentInstance-v0_8_0.xsd | 12 ++++++------
 CDT-delivery-v0_8_0.xsd        |  3 ++-
 CDT-group-v0_8_0.xsd           |  4 +++-
 CDT-remoteCSE-v0_8_0.xsd       |  4 ++--
 CDT-request-v0_8_0.xsd         |  2 ++
 CDT-schedule-v0_8_0.xsd        |  3 ++-
 CDT-subscription-v0_8_0.xsd    | 12 ++++++------
 10 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/CDT-CSEBase-v0_8_0.xsd b/CDT-CSEBase-v0_8_0.xsd
index 48c4f13..a89d74e 100644
--- a/CDT-CSEBase-v0_8_0.xsd
+++ b/CDT-CSEBase-v0_8_0.xsd
@@ -54,7 +54,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
 						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
 						<xs:element name="CSE-ID" type="m2m:ID" />
-						<!-- TODO: update TS-0004 to remove m2m:resourceTypeList -->
 						<xs:element name="supportedResourceType">
 							<xs:simpleType>
 								<xs:list itemType="m2m:resourceType" />
diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index 1065f3b..162e29b 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:complexType name="externalId">
+	<xs:complexType name="externalID">
 		<xs:simpleContent>
 			<xs:extension base="xs:anyURI">
 			</xs:extension>
@@ -179,7 +179,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:simpleType name="triggerRecipientId">
+	<xs:simpleType name="triggerRecipientID">
 		<xs:restriction base="xs:unsignedInt" />
 	</xs:simpleType>
 
diff --git a/CDT-container-v0_8_0.xsd b/CDT-container-v0_8_0.xsd
index 6416ec9..a27efbe 100644
--- a/CDT-container-v0_8_0.xsd
+++ b/CDT-container-v0_8_0.xsd
@@ -30,8 +30,9 @@
 			<xs:complexContent>
 				<xs:extension base="m2m:announceableResource">
 					<xs:sequence>
-						<!-- Resource Specific Attributes -->
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
 						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes -->
 						<xs:element name="creator" type="m2m:ID" />
 						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
@@ -64,14 +65,14 @@
 			<xs:complexContent>
 				<xs:extension base="m2m:announcedResource">
 					<xs:sequence>
-						<!-- Resource Specific Attributes -->
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
 						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes -->
 						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
 						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
-						<xs:element name="latest" type="xs:string" minOccurs="0" />
 						<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 
diff --git a/CDT-contentInstance-v0_8_0.xsd b/CDT-contentInstance-v0_8_0.xsd
index 4732313..8317003 100644
--- a/CDT-contentInstance-v0_8_0.xsd
+++ b/CDT-contentInstance-v0_8_0.xsd
@@ -36,14 +36,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:complexContent>
 				<xs:extension base="m2m:announceableSubordinateResource">
 					<xs:sequence>
-						<!-- Resource Specific Attributes -->
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
 						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- Resource Specific Attributes -->
 						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<xs:element name="typeOfContent" type="xs:string" minOccurs="0" />
+						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
 						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="content" type="xs:anyType" />
-						<xs:element name="encoding" type="m2m:encodingType" minOccurs="0" />
 					</xs:sequence>
 				</xs:extension>
 			</xs:complexContent>
@@ -55,13 +55,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:complexContent>
 				<xs:extension base="m2m:announcedSubordinateResource">
 					<xs:sequence>
-						<!-- Resource Specific Attributes -->
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
 						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<xs:element name="typeOfContent" type="xs:string" minOccurs="0" />
+						<!-- Resource Specific Attributes -->
+						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
 						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="content" type="xs:anyType" minOccurs="0" />
-						<xs:element name="encoding" type="m2m:encodingType" minOccurs="0" />
 					</xs:sequence>
 				</xs:extension>
 			</xs:complexContent>
diff --git a/CDT-delivery-v0_8_0.xsd b/CDT-delivery-v0_8_0.xsd
index 1c7f034..517c456 100644
--- a/CDT-delivery-v0_8_0.xsd
+++ b/CDT-delivery-v0_8_0.xsd
@@ -37,8 +37,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<!-- Inherit common attributes -->
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 						<!-- Resource Specific Attributes -->
-						<!-- TODO: The type of source and target should match that of CSE-ID (i.e.they should have type m2m:ID) -->
 						<xs:element name="source" type="m2m:ID" />
 						<xs:element name="target" type="m2m:ID" />
 						<xs:element name="lifespan" type="m2m:timestamp" />
diff --git a/CDT-group-v0_8_0.xsd b/CDT-group-v0_8_0.xsd
index 7726f57..81649bc 100644
--- a/CDT-group-v0_8_0.xsd
+++ b/CDT-group-v0_8_0.xsd
@@ -37,8 +37,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:announceableResource">
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>					
-                        <xs:element name="creator" type="xs:anyURI" minOccurs="0" />					
+                        <xs:element name="creator" type="m2m:ID" minOccurs="0" />					
 						<xs:element name="memberType" type="m2m:memberType" />
+						<!-- TODO: data type xs:long is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (unchanged in #662R02) -->
 						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
 						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
 						<xs:element name="memberIDs" type="m2m:listOfURIs" />
@@ -69,6 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
 						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
+						<!-- TODO: data type xs:long is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (unchanged in #662R02) -->
 						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
 						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
diff --git a/CDT-remoteCSE-v0_8_0.xsd b/CDT-remoteCSE-v0_8_0.xsd
index d496061..414a613 100644
--- a/CDT-remoteCSE-v0_8_0.xsd
+++ b/CDT-remoteCSE-v0_8_0.xsd
@@ -49,8 +49,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" />
 						<xs:element name="CSEBase" type="xs:anyURI" />
 						<xs:element name="CSE-ID" type="m2m:ID" />
-						<xs:element name="M2M-Ext-ID" type="m2m:externalId" minOccurs="0" />
-						<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientId" minOccurs="0" />
+						<xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
+						<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
 						<xs:element name="requestReachability" type="xs:boolean" />
 						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
 						
diff --git a/CDT-request-v0_8_0.xsd b/CDT-request-v0_8_0.xsd
index f0d6327..e410fcd 100644
--- a/CDT-request-v0_8_0.xsd
+++ b/CDT-request-v0_8_0.xsd
@@ -36,6 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<!-- Inherit common attributes -->
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
+						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 						<!-- Resource Specific Attributes -->
 						<xs:element name="operation" type="m2m:operation" />
 						<xs:element name="target" type="xs:anyURI" />
diff --git a/CDT-schedule-v0_8_0.xsd b/CDT-schedule-v0_8_0.xsd
index 2f02819..108217b 100644
--- a/CDT-schedule-v0_8_0.xsd
+++ b/CDT-schedule-v0_8_0.xsd
@@ -36,7 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:announceableSubordinateResource">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
-						<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
+						<!-- TODO: Editor's notes on multiplicity of 'scheduleElement' attribute: should be 1 --> 
+						<xs:element name="scheduleElement" type="m2m:scheduleEntries"  />
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/CDT-subscription-v0_8_0.xsd b/CDT-subscription-v0_8_0.xsd
index 1f852be..a1278f5 100644
--- a/CDT-subscription-v0_8_0.xsd
+++ b/CDT-subscription-v0_8_0.xsd
@@ -66,14 +66,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:complexType name="eventNotificationCriteria">
 		<xs:sequence>
-			<xs:element name="createdBefore" type="xs:dateTime" minOccurs="0" />
-			<xs:element name="createdAfter" type="xs:dateTime" minOccurs="0" />
-			<xs:element name="modifiedSince" type="xs:dateTime" minOccurs="0" />
-			<xs:element name="unmodifiedSince" type="xs:dateTime" minOccurs="0" />
+			<xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
+			<xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
+			<xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
+			<xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
 			<xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="expireBefore" type="xs:dateTime" minOccurs="0" />
-			<xs:element name="expireAfter" type="xs:dateTime" minOccurs="0" />
+			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
+			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
 			<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" />
-- 
2.18.1