From 8032f6e5537ee821581d13c1e68848e7dab777bc Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Mon, 5 Oct 2015 19:42:11 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_2_0/CDT-AE-v2_2_0.xsd b/v2_2_0/CDT-AE-v2_2_0.xsd
index 744a948..323e625 100644
--- a/v2_2_0/CDT-AE-v2_2_0.xsd
+++ b/v2_2_0/CDT-AE-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-CSEBase-v2_2_0.xsd b/v2_2_0/CDT-CSEBase-v2_2_0.xsd
index 129e96c..df2f31f 100644
--- a/v2_2_0/CDT-CSEBase-v2_2_0.xsd
+++ b/v2_2_0/CDT-CSEBase-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_0_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_2_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_2_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-accessControlPolicy-v2_2_0.xsd b/v2_2_0/CDT-accessControlPolicy-v2_2_0.xsd
index b93af98..f176ad7 100644
--- a/v2_2_0/CDT-accessControlPolicy-v2_2_0.xsd
+++ b/v2_2_0/CDT-accessControlPolicy-v2_2_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-v2_0_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-activeCmdhPolicy-v2_2_0.xsd b/v2_2_0/CDT-activeCmdhPolicy-v2_2_0.xsd
index 8d6fe6d..87b02f0 100644
--- a/v2_2_0/CDT-activeCmdhPolicy-v2_2_0.xsd
+++ b/v2_2_0/CDT-activeCmdhPolicy-v2_2_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-v2_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v2_2_0/CDT-areaNwkDeviceInfo-v2_2_0.xsd b/v2_2_0/CDT-areaNwkDeviceInfo-v2_2_0.xsd
index 43a8804..c789174 100644
--- a/v2_2_0/CDT-areaNwkDeviceInfo-v2_2_0.xsd
+++ b/v2_2_0/CDT-areaNwkDeviceInfo-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-areaNwkInfo-v2_2_0.xsd b/v2_2_0/CDT-areaNwkInfo-v2_2_0.xsd
index ddbacf9..c971b9b 100644
--- a/v2_2_0/CDT-areaNwkInfo-v2_2_0.xsd
+++ b/v2_2_0/CDT-areaNwkInfo-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-battery-v2_2_0.xsd b/v2_2_0/CDT-battery-v2_2_0.xsd
index dfa961f..6856175 100644
--- a/v2_2_0/CDT-battery-v2_2_0.xsd
+++ b/v2_2_0/CDT-battery-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-cmdhBuffer-v2_2_0.xsd b/v2_2_0/CDT-cmdhBuffer-v2_2_0.xsd
index e1ae430..bd00176 100644
--- a/v2_2_0/CDT-cmdhBuffer-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhBuffer-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v2_2_0/CDT-cmdhDefEcValue-v2_2_0.xsd b/v2_2_0/CDT-cmdhDefEcValue-v2_2_0.xsd
index d48706c..1b1a36e 100644
--- a/v2_2_0/CDT-cmdhDefEcValue-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhDefEcValue-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v2_2_0/CDT-cmdhDefaults-v2_2_0.xsd b/v2_2_0/CDT-cmdhDefaults-v2_2_0.xsd
index f262ef1..297b84f 100644
--- a/v2_2_0/CDT-cmdhDefaults-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhDefaults-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v2_2_0/CDT-cmdhEcDefParamValues-v2_2_0.xsd b/v2_2_0/CDT-cmdhEcDefParamValues-v2_2_0.xsd
index ff140d3..988d877 100644
--- a/v2_2_0/CDT-cmdhEcDefParamValues-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhEcDefParamValues-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v2_2_0/CDT-cmdhLimits-v2_2_0.xsd b/v2_2_0/CDT-cmdhLimits-v2_2_0.xsd
index faf86b7..db7f6f2 100644
--- a/v2_2_0/CDT-cmdhLimits-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhLimits-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v2_2_0/CDT-cmdhNetworkAccessRules-v2_2_0.xsd b/v2_2_0/CDT-cmdhNetworkAccessRules-v2_2_0.xsd
index afffc46..298c230 100644
--- a/v2_2_0/CDT-cmdhNetworkAccessRules-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhNetworkAccessRules-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v2_2_0/CDT-cmdhNwAccessRule-v2_2_0.xsd b/v2_2_0/CDT-cmdhNwAccessRule-v2_2_0.xsd
index 1384086..3c37f11 100644
--- a/v2_2_0/CDT-cmdhNwAccessRule-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhNwAccessRule-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v2_2_0/CDT-cmdhPolicy-v2_2_0.xsd b/v2_2_0/CDT-cmdhPolicy-v2_2_0.xsd
index bcce2f1..5d1ea3d 100644
--- a/v2_2_0/CDT-cmdhPolicy-v2_2_0.xsd
+++ b/v2_2_0/CDT-cmdhPolicy-v2_2_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-v2_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v2_2_0/CDT-commonTypes-v2_2_0.xsd b/v2_2_0/CDT-commonTypes-v2_2_0.xsd
index 4e2c999..c70c1ae 100644
--- a/v2_2_0/CDT-commonTypes-v2_2_0.xsd
+++ b/v2_2_0/CDT-commonTypes-v2_2_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-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_2_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_2_0/CDT-container-v2_2_0.xsd b/v2_2_0/CDT-container-v2_2_0.xsd
index 0bf19a5..a3a5a14 100644
--- a/v2_2_0/CDT-container-v2_2_0.xsd
+++ b/v2_2_0/CDT-container-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-contentInstance-v2_2_0.xsd b/v2_2_0/CDT-contentInstance-v2_2_0.xsd
index 0bd49c5..68cc401 100644
--- a/v2_2_0/CDT-contentInstance-v2_2_0.xsd
+++ b/v2_2_0/CDT-contentInstance-v2_2_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-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-delivery-v2_2_0.xsd b/v2_2_0/CDT-delivery-v2_2_0.xsd
index a370310..b8fd0d4 100644
--- a/v2_2_0/CDT-delivery-v2_2_0.xsd
+++ b/v2_2_0/CDT-delivery-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v2_2_0/CDT-deviceCapability-v2_2_0.xsd b/v2_2_0/CDT-deviceCapability-v2_2_0.xsd
index 64a68d1..48a5645 100644
--- a/v2_2_0/CDT-deviceCapability-v2_2_0.xsd
+++ b/v2_2_0/CDT-deviceCapability-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-deviceInfo-v2_2_0.xsd b/v2_2_0/CDT-deviceInfo-v2_2_0.xsd
index 282159e..3516d9a 100644
--- a/v2_2_0/CDT-deviceInfo-v2_2_0.xsd
+++ b/v2_2_0/CDT-deviceInfo-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-eventConfig-v2_2_0.xsd b/v2_2_0/CDT-eventConfig-v2_2_0.xsd
index 6cf3471..2db9bdc 100644
--- a/v2_2_0/CDT-eventConfig-v2_2_0.xsd
+++ b/v2_2_0/CDT-eventConfig-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-eventLog-v2_2_0.xsd b/v2_2_0/CDT-eventLog-v2_2_0.xsd
index 63029b5..ec8fe35 100644
--- a/v2_2_0/CDT-eventLog-v2_2_0.xsd
+++ b/v2_2_0/CDT-eventLog-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-execInstance-v2_2_0.xsd b/v2_2_0/CDT-execInstance-v2_2_0.xsd
index 7f0d9fe..4fdb38b 100644
--- a/v2_2_0/CDT-execInstance-v2_2_0.xsd
+++ b/v2_2_0/CDT-execInstance-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-firmware-v2_2_0.xsd b/v2_2_0/CDT-firmware-v2_2_0.xsd
index 946aef2..a13c4c3 100644
--- a/v2_2_0/CDT-firmware-v2_2_0.xsd
+++ b/v2_2_0/CDT-firmware-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-group-v2_2_0.xsd b/v2_2_0/CDT-group-v2_2_0.xsd
index 6cb5797..c08227f 100644
--- a/v2_2_0/CDT-group-v2_2_0.xsd
+++ b/v2_2_0/CDT-group-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-locationPolicy-v2_2_0.xsd b/v2_2_0/CDT-locationPolicy-v2_2_0.xsd
index f7b1976..d14f9dc 100644
--- a/v2_2_0/CDT-locationPolicy-v2_2_0.xsd
+++ b/v2_2_0/CDT-locationPolicy-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd b/v2_2_0/CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd
index 9c37282..f045298 100644
--- a/v2_2_0/CDT-m2mServiceSubscriptionProfile-v2_2_0.xsd
+++ b/v2_2_0/CDT-m2mServiceSubscriptionProfile-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_2_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-memory-v2_2_0.xsd b/v2_2_0/CDT-memory-v2_2_0.xsd
index 7ebcdc0..7997060 100644
--- a/v2_2_0/CDT-memory-v2_2_0.xsd
+++ b/v2_2_0/CDT-memory-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-mgmtCmd-v2_2_0.xsd b/v2_2_0/CDT-mgmtCmd-v2_2_0.xsd
index c637adc..acac8fd 100644
--- a/v2_2_0/CDT-mgmtCmd-v2_2_0.xsd
+++ b/v2_2_0/CDT-mgmtCmd-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_2_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-node-v2_2_0.xsd b/v2_2_0/CDT-node-v2_2_0.xsd
index 805c183..1da51e0 100644
--- a/v2_2_0/CDT-node-v2_2_0.xsd
+++ b/v2_2_0/CDT-node-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-notification-v2_2_0.xsd b/v2_2_0/CDT-notification-v2_2_0.xsd
index 5ccfc52..bfd0b88 100644
--- a/v2_2_0/CDT-notification-v2_2_0.xsd
+++ b/v2_2_0/CDT-notification-v2_2_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-v2_0_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_2_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_2_0/CDT-pollingChannel-v2_2_0.xsd b/v2_2_0/CDT-pollingChannel-v2_2_0.xsd
index 5c7bf01..12ea937 100644
--- a/v2_2_0/CDT-pollingChannel-v2_2_0.xsd
+++ b/v2_2_0/CDT-pollingChannel-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-reboot-v2_2_0.xsd b/v2_2_0/CDT-reboot-v2_2_0.xsd
index a638790..8fdb59b 100644
--- a/v2_2_0/CDT-reboot-v2_2_0.xsd
+++ b/v2_2_0/CDT-reboot-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-remoteCSE-v2_2_0.xsd b/v2_2_0/CDT-remoteCSE-v2_2_0.xsd
index ec6911c..ff0297c 100644
--- a/v2_2_0/CDT-remoteCSE-v2_2_0.xsd
+++ b/v2_2_0/CDT-remoteCSE-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_2_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-request-v2_2_0.xsd b/v2_2_0/CDT-request-v2_2_0.xsd
index 022693d..425606a 100644
--- a/v2_2_0/CDT-request-v2_2_0.xsd
+++ b/v2_2_0/CDT-request-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-requestPrimitive-v2_2_0.xsd b/v2_2_0/CDT-requestPrimitive-v2_2_0.xsd
index d58dd5b..d17512f 100644
--- a/v2_2_0/CDT-requestPrimitive-v2_2_0.xsd
+++ b/v2_2_0/CDT-requestPrimitive-v2_2_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-v2_0_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_2_0/CDT-responsePrimitive-v2_2_0.xsd b/v2_2_0/CDT-responsePrimitive-v2_2_0.xsd
index dcd368d..23e10c1 100644
--- a/v2_2_0/CDT-responsePrimitive-v2_2_0.xsd
+++ b/v2_2_0/CDT-responsePrimitive-v2_2_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-v2_0_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" /> 
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_2_0/CDT-schedule-v2_2_0.xsd b/v2_2_0/CDT-schedule-v2_2_0.xsd
index c07e870..ce3ec17 100644
--- a/v2_2_0/CDT-schedule-v2_2_0.xsd
+++ b/v2_2_0/CDT-schedule-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-serviceSubscribedAppRule-v2_2_0.xsd b/v2_2_0/CDT-serviceSubscribedAppRule-v2_2_0.xsd
index d7321a1..cc7519b 100644
--- a/v2_2_0/CDT-serviceSubscribedAppRule-v2_2_0.xsd
+++ b/v2_2_0/CDT-serviceSubscribedAppRule-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-serviceSubscribedNode-v2_2_0.xsd b/v2_2_0/CDT-serviceSubscribedNode-v2_2_0.xsd
index aebd02b..88d0582 100644
--- a/v2_2_0/CDT-serviceSubscribedNode-v2_2_0.xsd
+++ b/v2_2_0/CDT-serviceSubscribedNode-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-software-v2_2_0.xsd b/v2_2_0/CDT-software-v2_2_0.xsd
index ffda8b2..6db4857 100644
--- a/v2_2_0/CDT-software-v2_2_0.xsd
+++ b/v2_2_0/CDT-software-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-statsCollect-v2_2_0.xsd b/v2_2_0/CDT-statsCollect-v2_2_0.xsd
index 362dd80..01aa723 100644
--- a/v2_2_0/CDT-statsCollect-v2_2_0.xsd
+++ b/v2_2_0/CDT-statsCollect-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-statsConfig-v2_2_0.xsd b/v2_2_0/CDT-statsConfig-v2_2_0.xsd
index 160cb20..a328d04 100644
--- a/v2_2_0/CDT-statsConfig-v2_2_0.xsd
+++ b/v2_2_0/CDT-statsConfig-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_2_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v2_2_0/CDT-subscription-v2_2_0.xsd b/v2_2_0/CDT-subscription-v2_2_0.xsd
index adc445e..1079e6b 100644
--- a/v2_2_0/CDT-subscription-v2_2_0.xsd
+++ b/v2_2_0/CDT-subscription-v2_2_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-v2_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_2_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab