diff --git a/v2_4_0/CDT-AE-v2_4_0.xsd b/v2_4_0/CDT-AE-v2_4_0.xsd
index 856893f70d64e031d90154f5974fe4a6a6ce1ff2..567fff99d046acb39fbe0c476bdd2585086e815e 100644
--- a/v2_4_0/CDT-AE-v2_4_0.xsd
+++ b/v2_4_0/CDT-AE-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
<xs:element name="AE">
<xs:complexType>
diff --git a/v2_4_0/CDT-CSEBase-v2_4_0.xsd b/v2_4_0/CDT-CSEBase-v2_4_0.xsd
index 3e57d1afc3ba816048d22c4d5b1c4cf2eea0f0be..1af589357f4abb540b45c653885a9f45cda01c3f 100644
--- a/v2_4_0/CDT-CSEBase-v2_4_0.xsd
+++ b/v2_4_0/CDT-CSEBase-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_4_0.xsd" />
<xs:element name="CSEBase">
<xs:complexType>
diff --git a/v2_4_0/CDT-accessControlPolicy-v2_4_0.xsd b/v2_4_0/CDT-accessControlPolicy-v2_4_0.xsd
index dffdb7ad6e6d896c30fa9ab32d350e813836ecb8..503edf4b059acf65cf3edc5a97aad751b9c5031c 100644
--- a/v2_4_0/CDT-accessControlPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-accessControlPolicy-v2_4_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_3_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd"/>
<xs:element name="accessControlPolicy">
<xs:complexType>
diff --git a/v2_4_0/CDT-activeCmdhPolicy-v2_4_0.xsd b/v2_4_0/CDT-activeCmdhPolicy-v2_4_0.xsd
index 5d27391425f735080a3ccc236c0a08fad0566607..67066626edaa7c4c646edfe2f860ec3a3f2b4098 100644
--- a/v2_4_0/CDT-activeCmdhPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-activeCmdhPolicy-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="activeCmdhPolicy">
<xs:complexType>
diff --git a/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_0.xsd b/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_0.xsd
index 0b7f95a505b5b47b528dc3513464faecc30f90bb..3526f2900e0529ecc49f8e7bc97e04f145e7cfc2 100644
--- a/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_0.xsd
+++ b/v2_4_0/CDT-areaNwkDeviceInfo-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="areaNwkDeviceInfo">
<xs:complexType>
diff --git a/v2_4_0/CDT-areaNwkInfo-v2_4_0.xsd b/v2_4_0/CDT-areaNwkInfo-v2_4_0.xsd
index 2f29169cb4f8be0828f5107fb541b5bf97e90fcc..1b1fcbac9d1cf43b4acc496460444efbd8d6dffe 100644
--- a/v2_4_0/CDT-areaNwkInfo-v2_4_0.xsd
+++ b/v2_4_0/CDT-areaNwkInfo-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="areaNwkInfo">
<xs:complexType>
diff --git a/v2_4_0/CDT-battery-v2_4_0.xsd b/v2_4_0/CDT-battery-v2_4_0.xsd
index 7c25e87b7827547d9c4eebe861fe12122d2f6f7f..d1c13a1e2cd7056d9cc4a6ee27fb32cddafa8eda 100644
--- a/v2_4_0/CDT-battery-v2_4_0.xsd
+++ b/v2_4_0/CDT-battery-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="battery">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhBuffer-v2_4_0.xsd b/v2_4_0/CDT-cmdhBuffer-v2_4_0.xsd
index 1dbbfc8c0548137a93e77c5fc334ff3d66079ce9..173a44f99c139cde16f353256950d5da0fc0a68f 100644
--- a/v2_4_0/CDT-cmdhBuffer-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhBuffer-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhBuffer">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhDefEcValue-v2_4_0.xsd b/v2_4_0/CDT-cmdhDefEcValue-v2_4_0.xsd
index c17d544b0f8a9f60185d5415ad615de57ef242e6..f074f723367c52df449f35cc988a5bc9604deffd 100644
--- a/v2_4_0/CDT-cmdhDefEcValue-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhDefEcValue-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhDefEcValue">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhDefaults-v2_4_0.xsd b/v2_4_0/CDT-cmdhDefaults-v2_4_0.xsd
index 70a4bb8c5f9bd6558c462f31c45582ad44d5ebd4..e9c4f48fcf86ddd8384a708bf25cf9a8f7c84eb0 100644
--- a/v2_4_0/CDT-cmdhDefaults-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhDefaults-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhDefaults">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_0.xsd b/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_0.xsd
index 1dfd07c7adc1e08b02db2c1f237c474a6f4edb97..7b21708909257299b0df2257f8136e33c5e9835a 100644
--- a/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhEcDefParamValues-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhEcDefParamValues">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhLimits-v2_4_0.xsd b/v2_4_0/CDT-cmdhLimits-v2_4_0.xsd
index 35023cd91519a674555d67b31e97ecf2a43e3c27..46ef4e16489b352aad938d82d445d30205c52517 100644
--- a/v2_4_0/CDT-cmdhLimits-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhLimits-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhLimits">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_0.xsd b/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_0.xsd
index 63ee950b01ac6d7f2d63d775a346f1d7381a3bbb..e387acfa329c3aa033f96e01b0b575b6938df273 100644
--- a/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhNetworkAccessRules-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhNetworkAccessRules">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhNwAccessRule-v2_4_0.xsd b/v2_4_0/CDT-cmdhNwAccessRule-v2_4_0.xsd
index fd242d794c1a4264b38467526c11f171785dda74..b5e62ae2c7c51185cfa67a641ebe860211ecad92 100644
--- a/v2_4_0/CDT-cmdhNwAccessRule-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhNwAccessRule-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhNwAccessRule">
<xs:complexType>
diff --git a/v2_4_0/CDT-cmdhPolicy-v2_4_0.xsd b/v2_4_0/CDT-cmdhPolicy-v2_4_0.xsd
index 9e2e6fe7068c889bbae381c0b75c7822400c083f..c99eed82264a943ffee2da4f9c325d9f48625540 100644
--- a/v2_4_0/CDT-cmdhPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-cmdhPolicy-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="cmdhPolicy" >
<xs:complexType>
diff --git a/v2_4_0/CDT-commonTypes-v2_4_0.xsd b/v2_4_0/CDT-commonTypes-v2_4_0.xsd
index e4295d9146318478997eabc611ab9ab5728221db..0d5e5c8c6b011a41915a20aeaebb3f1ae0585824 100644
--- a/v2_4_0/CDT-commonTypes-v2_4_0.xsd
+++ b/v2_4_0/CDT-commonTypes-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_4_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_4_0/CDT-container-v2_4_0.xsd b/v2_4_0/CDT-container-v2_4_0.xsd
index 1d8373ffbc8cf7c8798af89ab3c1dee241d5fb91..a71c3bdbbe62f9e8129c7de89d19cb969562c667 100644
--- a/v2_4_0/CDT-container-v2_4_0.xsd
+++ b/v2_4_0/CDT-container-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="container">
<xs:complexType>
diff --git a/v2_4_0/CDT-contentInstance-v2_4_0.xsd b/v2_4_0/CDT-contentInstance-v2_4_0.xsd
index eaf5f630c3942852fa8ad193ddaa1957316585e0..b1aa0ab9fab017dbf3295fcb8d7ee13850026ed8 100644
--- a/v2_4_0/CDT-contentInstance-v2_4_0.xsd
+++ b/v2_4_0/CDT-contentInstance-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="contentInstance">
<xs:complexType>
diff --git a/v2_4_0/CDT-delivery-v2_4_0.xsd b/v2_4_0/CDT-delivery-v2_4_0.xsd
index ee4ecaf9983690dfed9faeffb65751995b8399ec..b5e9c7a46eb381ce9f78ca50f5b02623bc1c920d 100644
--- a/v2_4_0/CDT-delivery-v2_4_0.xsd
+++ b/v2_4_0/CDT-delivery-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="delivery">
diff --git a/v2_4_0/CDT-deviceCapability-v2_4_0.xsd b/v2_4_0/CDT-deviceCapability-v2_4_0.xsd
index 9f943ae992c419d850cc028d1d9bba9e0ecd089f..584fcee29066715adf3b1640721ffd1d8c455f98 100644
--- a/v2_4_0/CDT-deviceCapability-v2_4_0.xsd
+++ b/v2_4_0/CDT-deviceCapability-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="deviceCapability">
<xs:complexType>
diff --git a/v2_4_0/CDT-deviceInfo-v2_4_0.xsd b/v2_4_0/CDT-deviceInfo-v2_4_0.xsd
index 08c2c161982a04462023e13ea06659ab2abd8bde..fd2fda87b8b5d9fbbddf197ba7db65add30280da 100644
--- a/v2_4_0/CDT-deviceInfo-v2_4_0.xsd
+++ b/v2_4_0/CDT-deviceInfo-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="deviceInfo">
<xs:complexType>
diff --git a/v2_4_0/CDT-eventConfig-v2_4_0.xsd b/v2_4_0/CDT-eventConfig-v2_4_0.xsd
index 9004af83bb06676e4479ae6c84e84012a9a1a561..6f029ba03653da5aa611a7b43f84d251c92c1be7 100644
--- a/v2_4_0/CDT-eventConfig-v2_4_0.xsd
+++ b/v2_4_0/CDT-eventConfig-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="eventConfig">
<xs:complexType>
diff --git a/v2_4_0/CDT-eventLog-v2_4_0.xsd b/v2_4_0/CDT-eventLog-v2_4_0.xsd
index 01be4ea705803c3302513e6b03b2451a07381de3..a620d0c6667f16d3d756c1dee9c88a5b1fe24cbf 100644
--- a/v2_4_0/CDT-eventLog-v2_4_0.xsd
+++ b/v2_4_0/CDT-eventLog-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="eventLog">
<xs:complexType>
diff --git a/v2_4_0/CDT-execInstance-v2_4_0.xsd b/v2_4_0/CDT-execInstance-v2_4_0.xsd
index e5827e44194526ec9eacec9ec936849bd8ee3c06..efd19f2f093007acfd6eb918f622a87ad90872cf 100644
--- a/v2_4_0/CDT-execInstance-v2_4_0.xsd
+++ b/v2_4_0/CDT-execInstance-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="execInstance">
<xs:complexType>
diff --git a/v2_4_0/CDT-firmware-v2_4_0.xsd b/v2_4_0/CDT-firmware-v2_4_0.xsd
index 30534aac31fd8d1133727d651626081c76f25861..b314411e8c9610a67f7b7e2299e03e155ebbd3f5 100644
--- a/v2_4_0/CDT-firmware-v2_4_0.xsd
+++ b/v2_4_0/CDT-firmware-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="firmware">
<xs:complexType>
diff --git a/v2_4_0/CDT-group-v2_4_0.xsd b/v2_4_0/CDT-group-v2_4_0.xsd
index 62d8aa99f353f5738ebc4d179643a800c5c1b67b..f4b89fb5884f34d56f469c2062b58c12f427c98c 100644
--- a/v2_4_0/CDT-group-v2_4_0.xsd
+++ b/v2_4_0/CDT-group-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="group">
<xs:complexType>
diff --git a/v2_4_0/CDT-locationPolicy-v2_4_0.xsd b/v2_4_0/CDT-locationPolicy-v2_4_0.xsd
index 036f200ec40cc37f1df2356d1990af8b578a1b23..409e4446ac67d4b33559d9462bb4c0195e066853 100644
--- a/v2_4_0/CDT-locationPolicy-v2_4_0.xsd
+++ b/v2_4_0/CDT-locationPolicy-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="locationPolicy">
<xs:complexType>
diff --git a/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd b/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd
index 3614701067333b872bba99754c891a81bb8f8c0e..37deb72829a3d7e2ebe7d6d35fb739306ca31c43 100644
--- a/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd
+++ b/v2_4_0/CDT-m2mServiceSubscriptionProfile-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile">
<xs:complexType>
diff --git a/v2_4_0/CDT-memory-v2_4_0.xsd b/v2_4_0/CDT-memory-v2_4_0.xsd
index 3b0d4702873aae7d6803ebf1ec706a963a6d4ffa..cbe9a4706b4931146ebeb2edcb9dd4335d0349ab 100644
--- a/v2_4_0/CDT-memory-v2_4_0.xsd
+++ b/v2_4_0/CDT-memory-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="memory">
<xs:complexType>
diff --git a/v2_4_0/CDT-mgmtCmd-v2_4_0.xsd b/v2_4_0/CDT-mgmtCmd-v2_4_0.xsd
index 41677dba1e19f7962647ab2e265eaabf62234a11..44c5f100cfb12b224fe4adf25f2fdae0cc06bfe7 100644
--- a/v2_4_0/CDT-mgmtCmd-v2_4_0.xsd
+++ b/v2_4_0/CDT-mgmtCmd-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
<xs:element name="mgmtCmd">
<xs:complexType>
diff --git a/v2_4_0/CDT-node-v2_4_0.xsd b/v2_4_0/CDT-node-v2_4_0.xsd
index b1d24ee46e9b97c94adca83076002ebbf745efc1..5316a30974c2d94adae1af96c9e1fdc8e8ec62fa 100644
--- a/v2_4_0/CDT-node-v2_4_0.xsd
+++ b/v2_4_0/CDT-node-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="node">
<xs:complexType>
diff --git a/v2_4_0/CDT-notification-v2_4_0.xsd b/v2_4_0/CDT-notification-v2_4_0.xsd
index 4dc86643db487cfc7102ed578d09cec3de5c9c98..1bed6d64d6e75620336a4c887f52dae00a6183be 100644
--- a/v2_4_0/CDT-notification-v2_4_0.xsd
+++ b/v2_4_0/CDT-notification-v2_4_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_3_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_4_0/CDT-pollingChannel-v2_4_0.xsd b/v2_4_0/CDT-pollingChannel-v2_4_0.xsd
index 124547446b36614661fb557adaf1961e1974e32d..7eb713198f709136a2b3cf44e9a62803717a0009 100644
--- a/v2_4_0/CDT-pollingChannel-v2_4_0.xsd
+++ b/v2_4_0/CDT-pollingChannel-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="pollingChannel">
<xs:complexType>
diff --git a/v2_4_0/CDT-reboot-v2_4_0.xsd b/v2_4_0/CDT-reboot-v2_4_0.xsd
index 0c5e849b254dfd0d52ec201bbf4931e23db29e97..84577fc872ced260b08a4964b1448bc844e387f0 100644
--- a/v2_4_0/CDT-reboot-v2_4_0.xsd
+++ b/v2_4_0/CDT-reboot-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="reboot">
<xs:complexType>
diff --git a/v2_4_0/CDT-remoteCSE-v2_4_0.xsd b/v2_4_0/CDT-remoteCSE-v2_4_0.xsd
index c456c144d0fc364e6a88b984d2acde7dec9f745a..d762cf6aa3809fd67f332a43d5f5aad87c69884d 100644
--- a/v2_4_0/CDT-remoteCSE-v2_4_0.xsd
+++ b/v2_4_0/CDT-remoteCSE-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
diff --git a/v2_4_0/CDT-request-v2_4_0.xsd b/v2_4_0/CDT-request-v2_4_0.xsd
index 3260482aaf37cc2d6452d5d2747c6df0e87d0e82..7055c2b4d1315e2ff7cf7129f133ea94b48b9f1e 100644
--- a/v2_4_0/CDT-request-v2_4_0.xsd
+++ b/v2_4_0/CDT-request-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="request">
<xs:complexType>
diff --git a/v2_4_0/CDT-requestPrimitive-v2_4_0.xsd b/v2_4_0/CDT-requestPrimitive-v2_4_0.xsd
index 843c6ba67a606292c03fc670f227593a151efa7e..a8c337dbea65de081498557fe458817305957d78 100644
--- a/v2_4_0/CDT-requestPrimitive-v2_4_0.xsd
+++ b/v2_4_0/CDT-requestPrimitive-v2_4_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_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_4_0/CDT-responsePrimitive-v2_4_0.xsd b/v2_4_0/CDT-responsePrimitive-v2_4_0.xsd
index 510af0004bfda6a8802fb4647af60e85c0534deb..adec6e7a62401a19dc6668692854d154028c6377 100644
--- a/v2_4_0/CDT-responsePrimitive-v2_4_0.xsd
+++ b/v2_4_0/CDT-responsePrimitive-v2_4_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-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_4_0/CDT-schedule-v2_4_0.xsd b/v2_4_0/CDT-schedule-v2_4_0.xsd
index f3269f4ec30192ad19bf8cdc814abb62da01cbe7..584164317dfd00af94f0509015aa7355e2d765f1 100644
--- a/v2_4_0/CDT-schedule-v2_4_0.xsd
+++ b/v2_4_0/CDT-schedule-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="schedule">
<xs:complexType>
diff --git a/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_0.xsd b/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_0.xsd
index aa59c6288d23722a593fd29857a785f1feb8c23c..c68124cbd5c469e55c67cbae752b08f1fea9066e 100644
--- a/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_0.xsd
+++ b/v2_4_0/CDT-serviceSubscribedAppRule-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="serviceSubscribedAppRule">
<xs:complexType>
diff --git a/v2_4_0/CDT-serviceSubscribedNode-v2_4_0.xsd b/v2_4_0/CDT-serviceSubscribedNode-v2_4_0.xsd
index 3a69b18ae562880a355adb453c0e581299d9ffa4..4125575ba82236860e5bd4564f421cd17c63ccc9 100644
--- a/v2_4_0/CDT-serviceSubscribedNode-v2_4_0.xsd
+++ b/v2_4_0/CDT-serviceSubscribedNode-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="serviceSubscribedNode">
<xs:complexType>
diff --git a/v2_4_0/CDT-software-v2_4_0.xsd b/v2_4_0/CDT-software-v2_4_0.xsd
index 99f3ace44908151928a51cac57571fb247d1e571..dccdb98f1df914e21ec594f9ecf0263b669e728f 100644
--- a/v2_4_0/CDT-software-v2_4_0.xsd
+++ b/v2_4_0/CDT-software-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="software">
<xs:complexType>
diff --git a/v2_4_0/CDT-statsCollect-v2_4_0.xsd b/v2_4_0/CDT-statsCollect-v2_4_0.xsd
index eeb495402f5c8d61db5d3945ea12bc4ba26c83ca..11aeb29505ee3618c6747dec67b6f1671dbeeaf3 100644
--- a/v2_4_0/CDT-statsCollect-v2_4_0.xsd
+++ b/v2_4_0/CDT-statsCollect-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="statsCollect">
<xs:complexType>
diff --git a/v2_4_0/CDT-statsConfig-v2_4_0.xsd b/v2_4_0/CDT-statsConfig-v2_4_0.xsd
index 0b41e32629599f150296936cac61f2494cb7f408..7715789be3328e3bd0e04203edfb982964a1294e 100644
--- a/v2_4_0/CDT-statsConfig-v2_4_0.xsd
+++ b/v2_4_0/CDT-statsConfig-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
<xs:element name="statsConfig">
<xs:complexType>
diff --git a/v2_4_0/CDT-subscription-v2_4_0.xsd b/v2_4_0/CDT-subscription-v2_4_0.xsd
index e784c1ecbabc3c9ed1b1e5a0980f8a7eb562a01f..836cd60a2674f29050fc096f8017d158028a4af5 100644
--- a/v2_4_0/CDT-subscription-v2_4_0.xsd
+++ b/v2_4_0/CDT-subscription-v2_4_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_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
<xs:element name="subscription">
<xs:complexType>