From 5745bd1ddf25e0a6f1579dcd2ae848763daa295c Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Wed, 23 Mar 2016 21:26:13 +0100
Subject: [PATCH] updated schemaLocation attribute values

---
 v1_7_0/CDT-AE-v1_7_0.xsd                      | 14 +--
 v1_7_0/CDT-CSEBase-v1_7_0.xsd                 | 34 +++----
 v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd     |  4 +-
 v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd        |  2 +-
 v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd       |  4 +-
 v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd             |  4 +-
 v1_7_0/CDT-battery-v1_7_0.xsd                 |  4 +-
 v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd              |  2 +-
 v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd          |  2 +-
 v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd            |  2 +-
 v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd    |  2 +-
 v1_7_0/CDT-cmdhLimits-v1_7_0.xsd              |  2 +-
 v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd  |  2 +-
 v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd        |  2 +-
 v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd              |  2 +-
 v1_7_0/CDT-commonTypes-v1_7_0.xsd             |  2 +-
 v1_7_0/CDT-container-v1_7_0.xsd               |  6 +-
 v1_7_0/CDT-contentInstance-v1_7_0.xsd         |  2 +-
 v1_7_0/CDT-delivery-v1_7_0.xsd                |  4 +-
 v1_7_0/CDT-deviceCapability-v1_7_0.xsd        |  4 +-
 v1_7_0/CDT-deviceInfo-v1_7_0.xsd              |  4 +-
 v1_7_0/CDT-eventConfig-v1_7_0.xsd             |  4 +-
 v1_7_0/CDT-eventLog-v1_7_0.xsd                |  4 +-
 v1_7_0/CDT-execInstance-v1_7_0.xsd            |  4 +-
 v1_7_0/CDT-firmware-v1_7_0.xsd                |  4 +-
 v1_7_0/CDT-group-v1_7_0.xsd                   |  4 +-
 v1_7_0/CDT-locationPolicy-v1_7_0.xsd          |  4 +-
 ...T-m2mServiceSubscriptionProfile-v1_7_0.xsd |  6 +-
 v1_7_0/CDT-memory-v1_7_0.xsd                  |  4 +-
 v1_7_0/CDT-mgmtCmd-v1_7_0.xsd                 |  6 +-
 v1_7_0/CDT-node-v1_7_0.xsd                    | 28 +++---
 v1_7_0/CDT-notification-v1_7_0.xsd            |  4 +-
 v1_7_0/CDT-pollingChannel-v1_7_0.xsd          |  4 +-
 v1_7_0/CDT-reboot-v1_7_0.xsd                  |  4 +-
 v1_7_0/CDT-remoteCSE-v1_7_0.xsd               | 18 ++--
 v1_7_0/CDT-request-v1_7_0.xsd                 |  4 +-
 v1_7_0/CDT-requestPrimitive-v1_7_0.xsd        |  2 +-
 v1_7_0/CDT-responsePrimitive-v1_7_0.xsd       | 90 +++++++++----------
 v1_7_0/CDT-schedule-v1_7_0.xsd                |  4 +-
 .../CDT-serviceSubscribedAppRule-v1_7_0.xsd   |  4 +-
 v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd   |  4 +-
 v1_7_0/CDT-software-v1_7_0.xsd                |  4 +-
 v1_7_0/CDT-statsCollect-v1_7_0.xsd            |  4 +-
 v1_7_0/CDT-statsConfig-v1_7_0.xsd             |  6 +-
 v1_7_0/CDT-subscription-v1_7_0.xsd            |  4 +-
 45 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/v1_7_0/CDT-AE-v1_7_0.xsd b/v1_7_0/CDT-AE-v1_7_0.xsd
index 79ad121..76b738f 100644
--- a/v1_7_0/CDT-AE-v1_7_0.xsd
+++ b/v1_7_0/CDT-AE-v1_7_0.xsd
@@ -26,13 +26,13 @@ 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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-CSEBase-v1_7_0.xsd b/v1_7_0/CDT-CSEBase-v1_7_0.xsd
index afe4111..667c614 100644
--- a/v1_7_0/CDT-CSEBase-v1_7_0.xsd
+++ b/v1_7_0/CDT-CSEBase-v1_7_0.xsd
@@ -26,23 +26,23 @@ 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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_6_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_7_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_7_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd b/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd
index df94e9c..7389adf 100644
--- a/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-accessControlPolicy-v1_7_0.xsd
@@ -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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd b/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd
index fc89785..cf8e225 100644
--- a/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-activeCmdhPolicy-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd b/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd
index 348e53c..bc9e0e1 100644
--- a/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd
+++ b/v1_7_0/CDT-areaNwkDeviceInfo-v1_7_0.xsd
@@ -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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd b/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd
index e18a7c7..f805291 100644
--- a/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd
+++ b/v1_7_0/CDT-areaNwkInfo-v1_7_0.xsd
@@ -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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-battery-v1_7_0.xsd b/v1_7_0/CDT-battery-v1_7_0.xsd
index 8b7bee5..4873e47 100644
--- a/v1_7_0/CDT-battery-v1_7_0.xsd
+++ b/v1_7_0/CDT-battery-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd b/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd
index 793d16e..c22840b 100644
--- a/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhBuffer-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd b/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd
index 87827f6..5bf4668 100644
--- a/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhDefEcValue-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd b/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd
index 2927c73..7632e27 100644
--- a/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhDefaults-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd b/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd
index e65ed67..22cd6fa 100644
--- a/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhEcDefParamValues-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd b/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd
index 84c3d74..17c12ff 100644
--- a/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhLimits-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd b/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd
index b9eba3c..45a46d2 100644
--- a/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhNetworkAccessRules-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd b/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd
index 974fecc..5ba3621 100644
--- a/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhNwAccessRule-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd b/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd
index d519bed..285e682 100644
--- a/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-cmdhPolicy-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_7_0/CDT-commonTypes-v1_7_0.xsd b/v1_7_0/CDT-commonTypes-v1_7_0.xsd
index 9cea8a7..18125e6 100644
--- a/v1_7_0/CDT-commonTypes-v1_7_0.xsd
+++ b/v1_7_0/CDT-commonTypes-v1_7_0.xsd
@@ -25,7 +25,7 @@ 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" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_7_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_7_0/CDT-container-v1_7_0.xsd b/v1_7_0/CDT-container-v1_7_0.xsd
index df5146c..cc4dd1e 100644
--- a/v1_7_0/CDT-container-v1_7_0.xsd
+++ b/v1_7_0/CDT-container-v1_7_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema 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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-contentInstance-v1_7_0.xsd b/v1_7_0/CDT-contentInstance-v1_7_0.xsd
index 73c088c..744aa03 100644
--- a/v1_7_0/CDT-contentInstance-v1_7_0.xsd
+++ b/v1_7_0/CDT-contentInstance-v1_7_0.xsd
@@ -27,7 +27,7 @@ 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-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-delivery-v1_7_0.xsd b/v1_7_0/CDT-delivery-v1_7_0.xsd
index e7acb3d..d4e851e 100644
--- a/v1_7_0/CDT-delivery-v1_7_0.xsd
+++ b/v1_7_0/CDT-delivery-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_7_0/CDT-deviceCapability-v1_7_0.xsd b/v1_7_0/CDT-deviceCapability-v1_7_0.xsd
index 85dc62e..bbd5c65 100644
--- a/v1_7_0/CDT-deviceCapability-v1_7_0.xsd
+++ b/v1_7_0/CDT-deviceCapability-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-deviceInfo-v1_7_0.xsd b/v1_7_0/CDT-deviceInfo-v1_7_0.xsd
index 30305fd..40bb767 100644
--- a/v1_7_0/CDT-deviceInfo-v1_7_0.xsd
+++ b/v1_7_0/CDT-deviceInfo-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-eventConfig-v1_7_0.xsd b/v1_7_0/CDT-eventConfig-v1_7_0.xsd
index 3140676..79ec3aa 100644
--- a/v1_7_0/CDT-eventConfig-v1_7_0.xsd
+++ b/v1_7_0/CDT-eventConfig-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-eventLog-v1_7_0.xsd b/v1_7_0/CDT-eventLog-v1_7_0.xsd
index 7a713f2..e1be4e4 100644
--- a/v1_7_0/CDT-eventLog-v1_7_0.xsd
+++ b/v1_7_0/CDT-eventLog-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-execInstance-v1_7_0.xsd b/v1_7_0/CDT-execInstance-v1_7_0.xsd
index 37c790f..546fdd7 100644
--- a/v1_7_0/CDT-execInstance-v1_7_0.xsd
+++ b/v1_7_0/CDT-execInstance-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-firmware-v1_7_0.xsd b/v1_7_0/CDT-firmware-v1_7_0.xsd
index 47944e2..5b5e1c2 100644
--- a/v1_7_0/CDT-firmware-v1_7_0.xsd
+++ b/v1_7_0/CDT-firmware-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-group-v1_7_0.xsd b/v1_7_0/CDT-group-v1_7_0.xsd
index c2e408c..cb50c47 100644
--- a/v1_7_0/CDT-group-v1_7_0.xsd
+++ b/v1_7_0/CDT-group-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-locationPolicy-v1_7_0.xsd b/v1_7_0/CDT-locationPolicy-v1_7_0.xsd
index 3631265..49c9921 100644
--- a/v1_7_0/CDT-locationPolicy-v1_7_0.xsd
+++ b/v1_7_0/CDT-locationPolicy-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd b/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd
index 1460b01..58c8e21 100644
--- a/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd
+++ b/v1_7_0/CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-memory-v1_7_0.xsd b/v1_7_0/CDT-memory-v1_7_0.xsd
index 0e7821d..ec17602 100644
--- a/v1_7_0/CDT-memory-v1_7_0.xsd
+++ b/v1_7_0/CDT-memory-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd b/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd
index 97ccc0d..786f560 100644
--- a/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd
+++ b/v1_7_0/CDT-mgmtCmd-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-node-v1_7_0.xsd b/v1_7_0/CDT-node-v1_7_0.xsd
index 633dec8..a463e5d 100644
--- a/v1_7_0/CDT-node-v1_7_0.xsd
+++ b/v1_7_0/CDT-node-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-notification-v1_7_0.xsd b/v1_7_0/CDT-notification-v1_7_0.xsd
index 8170b2b..4307296 100644
--- a/v1_7_0/CDT-notification-v1_7_0.xsd
+++ b/v1_7_0/CDT-notification-v1_7_0.xsd
@@ -24,8 +24,8 @@ 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-v1_6_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_7_0/CDT-pollingChannel-v1_7_0.xsd b/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
index 4f5959f..0113d43 100644
--- a/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
+++ b/v1_7_0/CDT-pollingChannel-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-reboot-v1_7_0.xsd b/v1_7_0/CDT-reboot-v1_7_0.xsd
index b0375f7..fbc828f 100644
--- a/v1_7_0/CDT-reboot-v1_7_0.xsd
+++ b/v1_7_0/CDT-reboot-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-remoteCSE-v1_7_0.xsd b/v1_7_0/CDT-remoteCSE-v1_7_0.xsd
index c55247e..6b46c04 100644
--- a/v1_7_0/CDT-remoteCSE-v1_7_0.xsd
+++ b/v1_7_0/CDT-remoteCSE-v1_7_0.xsd
@@ -26,15 +26,15 @@ 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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-request-v1_7_0.xsd b/v1_7_0/CDT-request-v1_7_0.xsd
index af63e0e..eda24d9 100644
--- a/v1_7_0/CDT-request-v1_7_0.xsd
+++ b/v1_7_0/CDT-request-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd b/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd
index 9bff80a..4105624 100644
--- a/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd
+++ b/v1_7_0/CDT-requestPrimitive-v1_7_0.xsd
@@ -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-v1_6_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd b/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
index 68b232a..99c7111 100644
--- a/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
+++ b/v1_7_0/CDT-responsePrimitive-v1_7_0.xsd
@@ -28,51 +28,51 @@ 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-v1_6_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v1_6_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_7_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_7_0/CDT-schedule-v1_7_0.xsd b/v1_7_0/CDT-schedule-v1_7_0.xsd
index bbb0e6c..6c20880 100644
--- a/v1_7_0/CDT-schedule-v1_7_0.xsd
+++ b/v1_7_0/CDT-schedule-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd b/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd
index f0c26f2..f53d588 100644
--- a/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd
+++ b/v1_7_0/CDT-serviceSubscribedAppRule-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd b/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd
index acba5e2..da39720 100644
--- a/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd
+++ b/v1_7_0/CDT-serviceSubscribedNode-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-software-v1_7_0.xsd b/v1_7_0/CDT-software-v1_7_0.xsd
index 9f32958..6eb760e 100644
--- a/v1_7_0/CDT-software-v1_7_0.xsd
+++ b/v1_7_0/CDT-software-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-statsCollect-v1_7_0.xsd b/v1_7_0/CDT-statsCollect-v1_7_0.xsd
index d8985c4..4461fa6 100644
--- a/v1_7_0/CDT-statsCollect-v1_7_0.xsd
+++ b/v1_7_0/CDT-statsCollect-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-statsConfig-v1_7_0.xsd b/v1_7_0/CDT-statsConfig-v1_7_0.xsd
index 2093834..5481b54 100644
--- a/v1_7_0/CDT-statsConfig-v1_7_0.xsd
+++ b/v1_7_0/CDT-statsConfig-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_7_0/CDT-subscription-v1_7_0.xsd b/v1_7_0/CDT-subscription-v1_7_0.xsd
index 4ed60b0..2fc1c49 100644
--- a/v1_7_0/CDT-subscription-v1_7_0.xsd
+++ b/v1_7_0/CDT-subscription-v1_7_0.xsd
@@ -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-v1_6_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_6_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab