From 2641be6114f874ef02480e155955e1457bd9463c Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Thu, 2 Jun 2016 20:38:42 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v1_8_0/CDT-AE-v1_8_0.xsd b/v1_8_0/CDT-AE-v1_8_0.xsd
index 76b738f..1054c5c 100644
--- a/v1_8_0/CDT-AE-v1_8_0.xsd
+++ b/v1_8_0/CDT-AE-v1_8_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_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-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-CSEBase-v1_8_0.xsd b/v1_8_0/CDT-CSEBase-v1_8_0.xsd
index 667c614..202f2e4 100644
--- a/v1_8_0/CDT-CSEBase-v1_8_0.xsd
+++ b/v1_8_0/CDT-CSEBase-v1_8_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_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:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_8_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_8_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-accessControlPolicy-v1_8_0.xsd b/v1_8_0/CDT-accessControlPolicy-v1_8_0.xsd
index 7389adf..b0418b1 100644
--- a/v1_8_0/CDT-accessControlPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-accessControlPolicy-v1_8_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_7_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-activeCmdhPolicy-v1_8_0.xsd b/v1_8_0/CDT-activeCmdhPolicy-v1_8_0.xsd
index cf8e225..a409c76 100644
--- a/v1_8_0/CDT-activeCmdhPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-activeCmdhPolicy-v1_8_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_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_0.xsd b/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_0.xsd
index bc9e0e1..7b0eb26 100644
--- a/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_0.xsd
+++ b/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-areaNwkInfo-v1_8_0.xsd b/v1_8_0/CDT-areaNwkInfo-v1_8_0.xsd
index f805291..8e967e5 100644
--- a/v1_8_0/CDT-areaNwkInfo-v1_8_0.xsd
+++ b/v1_8_0/CDT-areaNwkInfo-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-battery-v1_8_0.xsd b/v1_8_0/CDT-battery-v1_8_0.xsd
index 4873e47..f4990dd 100644
--- a/v1_8_0/CDT-battery-v1_8_0.xsd
+++ b/v1_8_0/CDT-battery-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhBuffer-v1_8_0.xsd b/v1_8_0/CDT-cmdhBuffer-v1_8_0.xsd
index c22840b..6d0e945 100644
--- a/v1_8_0/CDT-cmdhBuffer-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhBuffer-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_8_0/CDT-cmdhDefEcValue-v1_8_0.xsd b/v1_8_0/CDT-cmdhDefEcValue-v1_8_0.xsd
index 5bf4668..a80458c 100644
--- a/v1_8_0/CDT-cmdhDefEcValue-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhDefEcValue-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_8_0/CDT-cmdhDefaults-v1_8_0.xsd b/v1_8_0/CDT-cmdhDefaults-v1_8_0.xsd
index 7632e27..b1e440f 100644
--- a/v1_8_0/CDT-cmdhDefaults-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhDefaults-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_0.xsd b/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_0.xsd
index 22cd6fa..3365c60 100644
--- a/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_8_0/CDT-cmdhLimits-v1_8_0.xsd b/v1_8_0/CDT-cmdhLimits-v1_8_0.xsd
index 17c12ff..5525b6e 100644
--- a/v1_8_0/CDT-cmdhLimits-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhLimits-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_0.xsd b/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_0.xsd
index 45a46d2..edf4c3d 100644
--- a/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_8_0/CDT-cmdhNwAccessRule-v1_8_0.xsd b/v1_8_0/CDT-cmdhNwAccessRule-v1_8_0.xsd
index 5ba3621..f5c7aa5 100644
--- a/v1_8_0/CDT-cmdhNwAccessRule-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhNwAccessRule-v1_8_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_7_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_8_0/CDT-cmdhPolicy-v1_8_0.xsd b/v1_8_0/CDT-cmdhPolicy-v1_8_0.xsd
index 285e682..397b03e 100644
--- a/v1_8_0/CDT-cmdhPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhPolicy-v1_8_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_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_8_0/CDT-commonTypes-v1_8_0.xsd b/v1_8_0/CDT-commonTypes-v1_8_0.xsd
index 2a13950..0c3b223 100644
--- a/v1_8_0/CDT-commonTypes-v1_8_0.xsd
+++ b/v1_8_0/CDT-commonTypes-v1_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_8_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_8_0/CDT-container-v1_8_0.xsd b/v1_8_0/CDT-container-v1_8_0.xsd
index cc4dd1e..1c233fa 100644
--- a/v1_8_0/CDT-container-v1_8_0.xsd
+++ b/v1_8_0/CDT-container-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-contentInstance-v1_8_0.xsd b/v1_8_0/CDT-contentInstance-v1_8_0.xsd
index 744aa03..ada2aec 100644
--- a/v1_8_0/CDT-contentInstance-v1_8_0.xsd
+++ b/v1_8_0/CDT-contentInstance-v1_8_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_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-delivery-v1_8_0.xsd b/v1_8_0/CDT-delivery-v1_8_0.xsd
index d4e851e..aa860f0 100644
--- a/v1_8_0/CDT-delivery-v1_8_0.xsd
+++ b/v1_8_0/CDT-delivery-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_8_0/CDT-deviceCapability-v1_8_0.xsd b/v1_8_0/CDT-deviceCapability-v1_8_0.xsd
index bbd5c65..ec9970b 100644
--- a/v1_8_0/CDT-deviceCapability-v1_8_0.xsd
+++ b/v1_8_0/CDT-deviceCapability-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-deviceInfo-v1_8_0.xsd b/v1_8_0/CDT-deviceInfo-v1_8_0.xsd
index 40bb767..75598e0 100644
--- a/v1_8_0/CDT-deviceInfo-v1_8_0.xsd
+++ b/v1_8_0/CDT-deviceInfo-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-eventConfig-v1_8_0.xsd b/v1_8_0/CDT-eventConfig-v1_8_0.xsd
index 79ec3aa..5134334 100644
--- a/v1_8_0/CDT-eventConfig-v1_8_0.xsd
+++ b/v1_8_0/CDT-eventConfig-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-eventLog-v1_8_0.xsd b/v1_8_0/CDT-eventLog-v1_8_0.xsd
index e1be4e4..c1d0307 100644
--- a/v1_8_0/CDT-eventLog-v1_8_0.xsd
+++ b/v1_8_0/CDT-eventLog-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-execInstance-v1_8_0.xsd b/v1_8_0/CDT-execInstance-v1_8_0.xsd
index 546fdd7..a336be8 100644
--- a/v1_8_0/CDT-execInstance-v1_8_0.xsd
+++ b/v1_8_0/CDT-execInstance-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-firmware-v1_8_0.xsd b/v1_8_0/CDT-firmware-v1_8_0.xsd
index 5b5e1c2..03a23ab 100644
--- a/v1_8_0/CDT-firmware-v1_8_0.xsd
+++ b/v1_8_0/CDT-firmware-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-group-v1_8_0.xsd b/v1_8_0/CDT-group-v1_8_0.xsd
index cb50c47..88b38c0 100644
--- a/v1_8_0/CDT-group-v1_8_0.xsd
+++ b/v1_8_0/CDT-group-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-locationPolicy-v1_8_0.xsd b/v1_8_0/CDT-locationPolicy-v1_8_0.xsd
index 49c9921..e34a652 100644
--- a/v1_8_0/CDT-locationPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-locationPolicy-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd b/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd
index 58c8e21..fb45f63 100644
--- a/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd
+++ b/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_8_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-memory-v1_8_0.xsd b/v1_8_0/CDT-memory-v1_8_0.xsd
index ec17602..5112928 100644
--- a/v1_8_0/CDT-memory-v1_8_0.xsd
+++ b/v1_8_0/CDT-memory-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-mgmtCmd-v1_8_0.xsd b/v1_8_0/CDT-mgmtCmd-v1_8_0.xsd
index 786f560..9b09e80 100644
--- a/v1_8_0/CDT-mgmtCmd-v1_8_0.xsd
+++ b/v1_8_0/CDT-mgmtCmd-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_8_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-node-v1_8_0.xsd b/v1_8_0/CDT-node-v1_8_0.xsd
index a463e5d..8c322e9 100644
--- a/v1_8_0/CDT-node-v1_8_0.xsd
+++ b/v1_8_0/CDT-node-v1_8_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_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:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-notification-v1_8_0.xsd b/v1_8_0/CDT-notification-v1_8_0.xsd
index 4307296..d63600e 100644
--- a/v1_8_0/CDT-notification-v1_8_0.xsd
+++ b/v1_8_0/CDT-notification-v1_8_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_7_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_8_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_8_0/CDT-pollingChannel-v1_8_0.xsd b/v1_8_0/CDT-pollingChannel-v1_8_0.xsd
index fc8c458..4553779 100644
--- a/v1_8_0/CDT-pollingChannel-v1_8_0.xsd
+++ b/v1_8_0/CDT-pollingChannel-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-reboot-v1_8_0.xsd b/v1_8_0/CDT-reboot-v1_8_0.xsd
index fbc828f..590cc61 100644
--- a/v1_8_0/CDT-reboot-v1_8_0.xsd
+++ b/v1_8_0/CDT-reboot-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-remoteCSE-v1_8_0.xsd b/v1_8_0/CDT-remoteCSE-v1_8_0.xsd
index 6b46c04..e00fc32 100644
--- a/v1_8_0/CDT-remoteCSE-v1_8_0.xsd
+++ b/v1_8_0/CDT-remoteCSE-v1_8_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_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:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-request-v1_8_0.xsd b/v1_8_0/CDT-request-v1_8_0.xsd
index eda24d9..2ca7669 100644
--- a/v1_8_0/CDT-request-v1_8_0.xsd
+++ b/v1_8_0/CDT-request-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-requestPrimitive-v1_8_0.xsd b/v1_8_0/CDT-requestPrimitive-v1_8_0.xsd
index 4105624..300b908 100644
--- a/v1_8_0/CDT-requestPrimitive-v1_8_0.xsd
+++ b/v1_8_0/CDT-requestPrimitive-v1_8_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_7_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd b/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd
index a9bcb78..765add7 100644
--- a/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd
+++ b/v1_8_0/CDT-responsePrimitive-v1_8_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_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:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v1_8_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
   
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_8_0/CDT-schedule-v1_8_0.xsd b/v1_8_0/CDT-schedule-v1_8_0.xsd
index 6c20880..0afe8b4 100644
--- a/v1_8_0/CDT-schedule-v1_8_0.xsd
+++ b/v1_8_0/CDT-schedule-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_0.xsd b/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_0.xsd
index f53d588..3d749ec 100644
--- a/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_0.xsd
+++ b/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-serviceSubscribedNode-v1_8_0.xsd b/v1_8_0/CDT-serviceSubscribedNode-v1_8_0.xsd
index da39720..a3313b5 100644
--- a/v1_8_0/CDT-serviceSubscribedNode-v1_8_0.xsd
+++ b/v1_8_0/CDT-serviceSubscribedNode-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-software-v1_8_0.xsd b/v1_8_0/CDT-software-v1_8_0.xsd
index 6eb760e..b7ffefa 100644
--- a/v1_8_0/CDT-software-v1_8_0.xsd
+++ b/v1_8_0/CDT-software-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-statsCollect-v1_8_0.xsd b/v1_8_0/CDT-statsCollect-v1_8_0.xsd
index 4461fa6..375ffec 100644
--- a/v1_8_0/CDT-statsCollect-v1_8_0.xsd
+++ b/v1_8_0/CDT-statsCollect-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-statsConfig-v1_8_0.xsd b/v1_8_0/CDT-statsConfig-v1_8_0.xsd
index 5481b54..c1b9b90 100644
--- a/v1_8_0/CDT-statsConfig-v1_8_0.xsd
+++ b/v1_8_0/CDT-statsConfig-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_8_0/CDT-subscription-v1_8_0.xsd b/v1_8_0/CDT-subscription-v1_8_0.xsd
index 2fc1c49..39f1546 100644
--- a/v1_8_0/CDT-subscription-v1_8_0.xsd
+++ b/v1_8_0/CDT-subscription-v1_8_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_7_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab