diff --git a/v2_2_0/CDT-AE-v2_2_0.xsd b/v2_2_0/CDT-AE-v2_2_0.xsd
index 744a948cf0998971880111fb2a601f3697cef310..323e6250cbfe95ef0e1311593393d87712903895 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 129e96cb1814b5b97fb5f8ffc058b22e47d5aeda..df2f31f01b4e460e84515369025c6b4d0bd9c25c 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 b93af984d38d8e7fd3121f8480c60a0b8d6b2e80..f176ad72f395429dda546704d9829aa76ab83cdb 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 8d6fe6d3dd0cac1498d50817fd6992d3de64db05..87b02f0ac20ee5a49a84adf408907cd8fc3ef443 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 43a8804639c1966fce0cb48b0f35a3892d06a315..c789174c6d5bfa9b2a2ec2d80deb372bdb8aeff1 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 ddbacf94c66ba474e8cb589c1dc8c830c1aee241..c971b9b5a61447a8ad0f57d74244b601f1fc2a2e 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 dfa961f34550feacc8d516ba21c17d91ef579ec4..68561756127cabe5a54e4bb6e5e49ff437481e53 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 e1ae430be62fb20a2ab59b2bbcbd6cac8812d83c..bd00176595e03d029424e285790f15c47d9af822 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 d48706cea3db1654d273f69a837effed91ae1577..1b1a36ee9621b2c1cfe3384fd0e9cf8c7f7b58b2 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 f262ef18974a3fd2de86ca7909b1f28e1f38ff5f..297b84fe6583281b760b7dc8ab60da32dbb921c5 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 ff140d3325237066cd1e7095bc4b26a51188c5bf..988d87796e4318a571e671c1deb542fd898469ce 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 faf86b743436481a4b505e1d3b7cbf0fac8de47e..db7f6f2c1e46db9f43c8fd800e717aee25f70f03 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 afffc467830046cbe82e577f690f6f79670586a2..298c23039d15929b7192d5e869ea0b5a79636a88 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 13840868bc7a6fbff2968a459b6680a5d2defe2e..3c37f117380debd3adbee8494fd43f12780abd28 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 bcce2f1fb91df80332bf6b3755e6ccae4f74efe0..5d1ea3d26bb003ea040a89918864feebce9e6d40 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 4e2c999ba213737c5b7eacd753b3158e030224f6..c70c1ae30c39ecf8fde4405b0cf589fd25db9c71 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 0bf19a5703a640dc0adb114def82848bae4ec22d..a3a5a14fbb40e027eb28627359f5e35f91f1d119 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 0bd49c5c05497522a487e43704dbfde2f92cd9a0..68cc4014c1bdc5efbe7bdb4ad85bbfc1f02ab21a 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 a370310fdff363101a60e58d9240290317cf2120..b8fd0d47116d789ce71c98d15ca513d0ed152cee 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 64a68d1e34f88e61e5f27cf42755ec9f664d134c..48a5645f7634fbbe8270bb09f3ddbf02ec045909 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 282159eb97c06e270ec4d3b7f90bf06078112a07..3516d9aeacae5c401705aad2f079b71d0d9a6353 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 6cf3471f2c39c80a8c7adeb0302e1a382d346e65..2db9bdcfe49901af5b63f43ff6320c96e4866a8a 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 63029b5594dd7bf861c8abca47566f37f2d80716..ec8fe355a9d5f1a6b95eab3acf63e7148f4f72ce 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 7f0d9feb99d8a9c6b1ad53873c158d328fb08eaf..4fdb38b47d4561fe9928abad24287da586cde3ee 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 946aef279d33468c51a98bbf70299d6172941623..a13c4c3859a9eefd288f8fa82d4c5995266d95f6 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 6cb57976a8f913c0fa4689f9e235be107f25bb2f..c08227f432cf22cf32b6e8147990a7fda4f6ad45 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 f7b19767e3c2b45a685b3901e853c2a2945a4688..d14f9dca980edc68de1724e2ea9b516ccd76e7f3 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 9c37282936d4cbd6cc035653d6cac6d09605748c..f04529830928f142e7c7d195371083382a549122 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 7ebcdc01f5fd85be4202884d1b56864e86df767d..7997060213a1a099fb26f57bc3f423bdde35823f 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 c637adcc173151de0c8a3447c6ac27876ebbabdf..acac8fdb0e6489a53990896dadc52032e405c1a3 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 805c183c2ce6dc05d3a511c82f85dc4aadca0d54..1da51e07516391e0bae4a7a6daefcb43641fa521 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 5ccfc52559d406aed0a56335051147721b78f1f8..bfd0b88dd05c9ee1f5853a553bf01ec13f1d43bf 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 5c7bf016133ee55d669e2fc2063d3e65d3c50f56..12ea937199f615400f9f0e61b32d02ac08cae6ca 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 a6387904be40a3ce2cbcbdba7f0fe443cecb7318..8fdb59b53b8d8c5590023493e10ca474e6e1af03 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 ec6911c1550c4e07249e287cf3a399718ab2f8c2..ff0297cefbc2e2ab1d992b416f5a1d433b66bbc0 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 022693da236692dd35364256c418f31da3416698..425606a5432f354ada9c4249084c47897d938d1b 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 d58dd5b456661f4c217f45ae884d9be86c458f4a..d17512f79b182083501d0c8a8d4c9d776ee4d49f 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 dcd368ddf85dd98c857b5c155fc8e76384f4a82d..23e10c1e26ed263aad864f8f01080c18bf9a2505 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 c07e870ad9b242570bfb7bbc185b819a7a117bda..ce3ec17f4a37bb66b1bc63dbe5d3816e91b0bb4a 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 d7321a1b11acdf4e8517db0fc2fdded2a877b09e..cc7519b633c6c936a808652f5e2078db68567efe 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 aebd02b2796e94295b49c0c32db32423ca02c698..88d0582c9561f00efb56c309aad582c93ea90110 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 ffda8b25242fadec2e055e5faef24b45263f0aa6..6db4857760cf446b189f9bfdb362ba8c99341fd8 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 362dd805335f87cbf0df36e4c9b328c959d887f7..01aa7234072bc780bb6fec37b36032ef5386d94a 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 160cb200ace8db8edbec4fbf47299d27cdf37012..a328d043d4e89d9ba278cf5f0ffa745df0f78e21 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 adc445e477868c0742a064c4f33c32f3db6fd57f..1079e6be827f6fc32b293e4e18d8401266427d7e 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>