From fe85291169f8276f4dd803f23f37e4233728cc8f Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Wed, 28 Jan 2015 21:30:10 +0100
Subject: [PATCH] Final updates before PRO#15.1 call

---
 CDT-accessControlPolicy-v0_8_0.xsd  | 7 +++++--
 CDT-cmdhEcDefParamValues-v0_8_0.xsd | 1 -
 CDT-commonTypes-v0_8_0.xsd          | 4 ++--
 CDT-locationPolicy-v0_8_0.xsd       | 8 ++++----
 CDT-requestPrimitive-v0_8_0.xsd     | 1 -
 CDT-subscription-v0_8_0.xsd         | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CDT-accessControlPolicy-v0_8_0.xsd b/CDT-accessControlPolicy-v0_8_0.xsd
index 3f36c72..f304ebb 100644
--- a/CDT-accessControlPolicy-v0_8_0.xsd
+++ b/CDT-accessControlPolicy-v0_8_0.xsd
@@ -76,7 +76,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<!-- TODO: 1) final decision: Should some or all of the data types defined below go into CDT-Common Types 
 		          (and "m2m:accessControlOperations" into CDT-Enumerations) ? 
-	           2) define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting)   -->
+	           2) define short names for the elements of insetOfAcrs (CR to TS-0004 for next PRO WG meeting) 
+                    accessControlRule, accessControlOriginators, accessControlOperations accessControlContexts, 
+                    accessControlWindow, accessControlIpAddresses, ipv4Addresses, ipv6Addresses, accessControlLocationRegion, 
+                    countryCode, circRegion"    -->
 
 	<xs:complexType name="setOfAcrs">
 		<xs:sequence>
@@ -124,7 +127,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 							</xs:complexType>
 						</xs:element>
 
-						<!-- TODO: mismatch with TS-0003 and TS-0004 where element is called accessControlLocationRegions" -->
+						<!-- TODO: mismatch with TS-0003 and TS-0004 where element is called "accessControlLocationRegions" -->
 						<!-- TODO: mismatch with TS-0004 where element has multiplicity [0..n] -->
 						<xs:element name="accessControlLocationRegion" type="m2m:locationRegion" minOccurs="0" />
 					</xs:sequence>
diff --git a/CDT-cmdhEcDefParamValues-v0_8_0.xsd b/CDT-cmdhEcDefParamValues-v0_8_0.xsd
index 33fc00d..c8574be 100644
--- a/CDT-cmdhEcDefParamValues-v0_8_0.xsd
+++ b/CDT-cmdhEcDefParamValues-v0_8_0.xsd
@@ -38,7 +38,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:sequence>
             <!-- mgmtObj specialization-specific Attributes -->
             <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <!-- TODO: confirm whether we should use xs:long (as in TS-0004) or  m2m:longMin-1 for following 4 attributes -->
             <xs:element name="defaultRequestExpTime" type="xs:long" />  <!-- units in milliseconds -->
             <xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
             <xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index 02e2402..bced59d 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -218,10 +218,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
 			<xs:element name="name" type="xs:string" minOccurs="0" />
 			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="requestMessageExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
+			<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="operationalExecutionTime" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="responseMessageType" type="m2m:responseType" minOccurs="0" />
+			<xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
 			<xs:element name="responsePersistence" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
 			<xs:element name="eventCategory" minOccurs="0">
diff --git a/CDT-locationPolicy-v0_8_0.xsd b/CDT-locationPolicy-v0_8_0.xsd
index 32d8f81..c48ac8c 100644
--- a/CDT-locationPolicy-v0_8_0.xsd
+++ b/CDT-locationPolicy-v0_8_0.xsd
@@ -43,8 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
-						<!-- TODO: verify that xs:string is really the best type for locationStatus -->
-						<xs:element name="locationStatus" type="xs:string" />
+						<!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
+						<xs:element name="locationStatus" type="m2m:status" />
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
@@ -72,8 +72,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
-						<!-- TODO: verify that xs:string is really the best type for locationStatus -->
-						<xs:element name="locationStatus" type="xs:string" minOccurs="0" />
+						<!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
+						<xs:element name="locationStatus" type="m2m:status" minOccurs="0" />
 
 						<!-- No Child Resources -->
 					</xs:sequence>
diff --git a/CDT-requestPrimitive-v0_8_0.xsd b/CDT-requestPrimitive-v0_8_0.xsd
index 83e0923..fb8e5aa 100644
--- a/CDT-requestPrimitive-v0_8_0.xsd
+++ b/CDT-requestPrimitive-v0_8_0.xsd
@@ -45,7 +45,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
           <!-- parameter "Name" -->
           <xs:element name="name" type="xs:string" minOccurs="0"/>
-          <!-- TODO: data type m2m:primitiveContent needs to be agreed and added into commonTypes -->
           <!-- parameter "Content" (of the primitive)-->
           <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/> 
           <!-- parameter "Originating Timestamp" -->
diff --git a/CDT-subscription-v0_8_0.xsd b/CDT-subscription-v0_8_0.xsd
index a1278f5..7da33fb 100644
--- a/CDT-subscription-v0_8_0.xsd
+++ b/CDT-subscription-v0_8_0.xsd
@@ -56,7 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" />
-							<xs:element ref="m2m:schedule"></xs:element>
+							<xs:element ref="m2m:schedule" />
 						</xs:choice>
 					</xs:sequence>
 				</xs:extension>
-- 
2.18.1