0_8_0 -> 1_0_0 migration

b529fdc5 · Peter Niblett · 57dd1ff4 · b529fdc5 · b529fdc5 · b529fdc5
Commit b529fdc5 authored Jan 29, 2015 by Peter Niblett
23 changed files
--- a/CDT-eventLog-v1_0_0.xsd
+++ b/CDT-eventLog-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>

--- a/CDT-execInstance-v1_0_0.xsd
+++ b/CDT-execInstance-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="execInstance">
 		<xs:complexType>

--- a/CDT-firmware-v1_0_0.xsd
+++ b/CDT-firmware-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>

--- a/CDT-group-v1_0_0.xsd
+++ b/CDT-group-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="group">
 		<xs:complexType>
@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>					
                        <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) -->
+						<!-- TODO: data type xs:integer is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (TS-0004 to be corrected) -->
 						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
 						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
 						<xs:element name="memberIDs" type="m2m:listOfURIs" />
@@ -70,7 +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) -->
+						<!-- TODO: data type xs:integer is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (TS-0004 to be corrected) -->
 						<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" />

--- a/CDT-locationPolicy-v1_0_0.xsd
+++ b/CDT-locationPolicy-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="locationPolicy">
 		<xs:complexType>
@@ -43,7 +43,7 @@ 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: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
+						<!-- 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 -->
@@ -72,7 +72,7 @@ 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: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
+						<!-- 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 -->

--- a/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
+++ b/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />

-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_0_0.xsd" />

 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>

--- a/CDT-memory-v1_0_0.xsd
+++ b/CDT-memory-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="memory">
 		<xs:complexType>

--- a/CDT-mgmtCmd-v1_0_0.xsd
+++ b/CDT-mgmtCmd-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_0_0.xsd" />

 	<xs:element name="mgmtCmd">
 		<xs:complexType>

--- a/CDT-node-v1_0_0.xsd
+++ b/CDT-node-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,20 +27,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="node">
 		<xs:complexType>

--- a/CDT-notification-v1_0_0.xsd
+++ b/CDT-notification-v1_0_0.xsd
@@ -4,7 +4,7 @@ Copyright Notification

 No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
 The copyright and the foregoing restriction extend to reproduction in all media.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -24,17 +24,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
        targetNamespace="http://www.onem2m.org/xml/protocols"
        xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
        xmlns:xs="http://www.w3.org/2001/XMLSchema">
-        <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd"/>
-        <xs:include schemaLocation="CDT-responsePrimitive-v0_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_0_0.xsd"/>
+

-        <!--  TODO: This "notification data object" does not comply (and does not need to comply) with the    
-              generic <resourceType> specification conventions.  One and only one instance of this data object is included
-              into the Content parameter of a Notify request primitive. However, the data object may include information, 
-              associated with one or more notification events. Do we need to differentiate singleNotification from 
-              aggregatedNotification? Probably not. Then the below top-level structure  can be simplified to represent simply
-              an unbounded sequence of singleNotification elements only.
-              We need to add into TS-0004 information which corresponds to the <resourceType> tables shown in TS-0001. 
-              -->
        <xs:element name="notification" type="m2m:notification" />      

        <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />

--- a/CDT-pollingChannel-v1_0_0.xsd
+++ b/CDT-pollingChannel-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="pollingChannel">
 		<xs:complexType>

--- a/CDT-reboot-v1_0_0.xsd
+++ b/CDT-reboot-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>

--- a/CDT-remoteCSE-v1_0_0.xsd
+++ b/CDT-remoteCSE-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />

-	<xs:include schemaLocation="CDT-AE-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />

 	<xs:element name="remoteCSE">
 		<xs:complexType>

--- a/CDT-request-v1_0_0.xsd
+++ b/CDT-request-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="request">
 		<xs:complexType>

--- a/CDT-requestPrimitive-v1_0_0.xsd
+++ b/CDT-requestPrimitive-v1_0_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
      xmlns:m2m="http://www.onem2m.org/xml/protocols"
      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   

-    <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 

    <xs:element name="requestPrimitive" >
      <xs:complexType>
@@ -57,7 +57,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
          <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/>
          <!-- parameter "Response Type" -->
          <xs:element name="responseType" type="m2m:resourceType" minOccurs="0"/>
-          <!-- TODO: check if the old names Response Persistense and responsePersistence have been replaced everywhere in TS-0004 -->
          <!-- parameter "Result Persistence" -->
          <xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/>
          <!-- parameter "Result Content" -->

--- a/CDT-responsePrimitive-v1_0_0.xsd
+++ b/CDT-responsePrimitive-v1_0_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -28,14 +28,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
      xmlns:m2m="http://www.onem2m.org/xml/protocols"
      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   

-    <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 

  <xs:element name="responsePrimitive" >
      <xs:complexType>
        <xs:sequence>
          <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
               Response Status Code  in TS-0004 -->
-          <!-- TODO: Table 6.4.2-1 of TS-0004 needs to be corrected: "m2m:responseStatus" to be replaced by "m2m:responseStatusCode" -->
          <!-- parameter "Response Status Code" -->
          <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
          <!-- parameter "Request Identifier" -->

--- a/CDT-schedule-v1_0_0.xsd
+++ b/CDT-schedule-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="schedule">
 		<xs:complexType>
@@ -36,7 +36,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:announceableSubordinateResource">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
-						<!-- TODO: Editor's notes on multiplicity of 'scheduleElement' attribute: should be 1 --> 
 						<xs:element name="scheduleElement" type="m2m:scheduleEntries"  />

 						<!-- Child Resources -->

--- a/CDT-serviceSubscribedAppRule-v1_0_0.xsd
+++ b/CDT-serviceSubscribedAppRule-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>

--- a/CDT-serviceSubscribedNode-v1_0_0.xsd
+++ b/CDT-serviceSubscribedNode-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>

--- a/CDT-software-v1_0_0.xsd
+++ b/CDT-software-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>

--- a/CDT-statsCollect-v1_0_0.xsd
+++ b/CDT-statsCollect-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="statsCollect">
 		<xs:complexType>

--- a/CDT-statsConfig-v1_0_0.xsd
+++ b/CDT-statsConfig-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.

 Notice of Disclaimer & Limitation of Liability 

@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />

 	<xs:element name="statsConfig">
 		<xs:complexType>

--- a/CDT-subscription-v1_0_0.xsd
+++ b/CDT-subscription-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
 contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
 This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
 any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.


 Notice of Disclaimer & Limitation of Liability 
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />

 	<xs:element name="subscription">
 		<xs:complexType>