diff --git a/v2_5_0/CDT-AE-v2_5_0.xsd b/v2_5_0/CDT-AE-v2_5_0.xsd
index 567fff99d046acb39fbe0c476bdd2585086e815e..ddf510879bb4cfdea784575a551940ee1f7db220 100644
--- a/v2_5_0/CDT-AE-v2_5_0.xsd
+++ b/v2_5_0/CDT-AE-v2_5_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_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-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
<xs:element name="AE">
<xs:complexType>
diff --git a/v2_5_0/CDT-CSEBase-v2_5_0.xsd b/v2_5_0/CDT-CSEBase-v2_5_0.xsd
index 1af589357f4abb540b45c653885a9f45cda01c3f..2190431f3b42e070c0276a4e2d072df14db572ac 100644
--- a/v2_5_0/CDT-CSEBase-v2_5_0.xsd
+++ b/v2_5_0/CDT-CSEBase-v2_5_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_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:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_5_0.xsd" />
<xs:element name="CSEBase">
<xs:complexType>
diff --git a/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd b/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
index 503edf4b059acf65cf3edc5a97aad751b9c5031c..cf1effdacde5e80891da63d59f888f32fd4f5d23 100644
--- a/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-accessControlPolicy-v2_5_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_4_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd"/>
<xs:element name="accessControlPolicy">
<xs:complexType>
diff --git a/v2_5_0/CDT-activeCmdhPolicy-v2_5_0.xsd b/v2_5_0/CDT-activeCmdhPolicy-v2_5_0.xsd
index 67066626edaa7c4c646edfe2f860ec3a3f2b4098..d07f7cf9bb8f7aa26716b1edceae844702403e3c 100644
--- a/v2_5_0/CDT-activeCmdhPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-activeCmdhPolicy-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="activeCmdhPolicy">
<xs:complexType>
diff --git a/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_0.xsd b/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_0.xsd
index 3526f2900e0529ecc49f8e7bc97e04f145e7cfc2..a7961cc726a66041ad00cb25f6d69b8687c4ad44 100644
--- a/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_0.xsd
+++ b/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="areaNwkDeviceInfo">
<xs:complexType>
diff --git a/v2_5_0/CDT-areaNwkInfo-v2_5_0.xsd b/v2_5_0/CDT-areaNwkInfo-v2_5_0.xsd
index 1b1fcbac9d1cf43b4acc496460444efbd8d6dffe..87f673f4c42f5fd019addba57ce721ebcac3b81e 100644
--- a/v2_5_0/CDT-areaNwkInfo-v2_5_0.xsd
+++ b/v2_5_0/CDT-areaNwkInfo-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="areaNwkInfo">
<xs:complexType>
diff --git a/v2_5_0/CDT-battery-v2_5_0.xsd b/v2_5_0/CDT-battery-v2_5_0.xsd
index d1c13a1e2cd7056d9cc4a6ee27fb32cddafa8eda..9d69be74c77e7f787b746c56c368c95eff85e1a4 100644
--- a/v2_5_0/CDT-battery-v2_5_0.xsd
+++ b/v2_5_0/CDT-battery-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="battery">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhBuffer-v2_5_0.xsd b/v2_5_0/CDT-cmdhBuffer-v2_5_0.xsd
index 173a44f99c139cde16f353256950d5da0fc0a68f..d07d9d5fe3c210ebb12230fe4eac2bda4d5a9346 100644
--- a/v2_5_0/CDT-cmdhBuffer-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhBuffer-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhBuffer">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhDefEcValue-v2_5_0.xsd b/v2_5_0/CDT-cmdhDefEcValue-v2_5_0.xsd
index f074f723367c52df449f35cc988a5bc9604deffd..ec292070976111203dbb3c301df4a92ab94e09a6 100644
--- a/v2_5_0/CDT-cmdhDefEcValue-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhDefEcValue-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhDefEcValue">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhDefaults-v2_5_0.xsd b/v2_5_0/CDT-cmdhDefaults-v2_5_0.xsd
index e9c4f48fcf86ddd8384a708bf25cf9a8f7c84eb0..2ee98113f449cbff4f161680c0ea0c3991718b18 100644
--- a/v2_5_0/CDT-cmdhDefaults-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhDefaults-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhDefaults">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_0.xsd b/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_0.xsd
index 7b21708909257299b0df2257f8136e33c5e9835a..7e1bccfc7ad2ee11cc678ec5fc6f199993fdbfa7 100644
--- a/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhEcDefParamValues">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhLimits-v2_5_0.xsd b/v2_5_0/CDT-cmdhLimits-v2_5_0.xsd
index 46ef4e16489b352aad938d82d445d30205c52517..cd79c86ae96b6650bf4b643f4a75f1b4536dc469 100644
--- a/v2_5_0/CDT-cmdhLimits-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhLimits-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhLimits">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_0.xsd b/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_0.xsd
index e387acfa329c3aa033f96e01b0b575b6938df273..f301d295a6ab471faa327cd0cce6c01d5c7f08fa 100644
--- a/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhNetworkAccessRules">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhNwAccessRule-v2_5_0.xsd b/v2_5_0/CDT-cmdhNwAccessRule-v2_5_0.xsd
index b5e62ae2c7c51185cfa67a641ebe860211ecad92..e8fc144646d773e2398ff22d511292758f650ea2 100644
--- a/v2_5_0/CDT-cmdhNwAccessRule-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhNwAccessRule-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhNwAccessRule">
<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhPolicy-v2_5_0.xsd b/v2_5_0/CDT-cmdhPolicy-v2_5_0.xsd
index c99eed82264a943ffee2da4f9c325d9f48625540..7a5c63bbb7fc2c5f209abadb3b47ed3cf3f8605a 100644
--- a/v2_5_0/CDT-cmdhPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhPolicy-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="cmdhPolicy" >
<xs:complexType>
diff --git a/v2_5_0/CDT-commonTypes-v2_5_0.xsd b/v2_5_0/CDT-commonTypes-v2_5_0.xsd
index 0d5e5c8c6b011a41915a20aeaebb3f1ae0585824..0652bdef9a42e0b292d6e130757f2b26ef5701ad 100644
--- a/v2_5_0/CDT-commonTypes-v2_5_0.xsd
+++ b/v2_5_0/CDT-commonTypes-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_5_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_5_0/CDT-container-v2_5_0.xsd b/v2_5_0/CDT-container-v2_5_0.xsd
index a71c3bdbbe62f9e8129c7de89d19cb969562c667..8ee50daec620d86c747207beb8bd9cbda8240d0c 100644
--- a/v2_5_0/CDT-container-v2_5_0.xsd
+++ b/v2_5_0/CDT-container-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="container">
<xs:complexType>
diff --git a/v2_5_0/CDT-contentInstance-v2_5_0.xsd b/v2_5_0/CDT-contentInstance-v2_5_0.xsd
index b1aa0ab9fab017dbf3295fcb8d7ee13850026ed8..4adfd16ee6606d492c0c7a29e5b61e3e2bb2f046 100644
--- a/v2_5_0/CDT-contentInstance-v2_5_0.xsd
+++ b/v2_5_0/CDT-contentInstance-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="contentInstance">
<xs:complexType>
diff --git a/v2_5_0/CDT-delivery-v2_5_0.xsd b/v2_5_0/CDT-delivery-v2_5_0.xsd
index b5e9c7a46eb381ce9f78ca50f5b02623bc1c920d..5d925113c921094105d730e6b2fa4abd6955c429 100644
--- a/v2_5_0/CDT-delivery-v2_5_0.xsd
+++ b/v2_5_0/CDT-delivery-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="delivery">
diff --git a/v2_5_0/CDT-deviceCapability-v2_5_0.xsd b/v2_5_0/CDT-deviceCapability-v2_5_0.xsd
index 584fcee29066715adf3b1640721ffd1d8c455f98..64a5ac6dabb1aee8cefae745c8a6a8951e8d5dff 100644
--- a/v2_5_0/CDT-deviceCapability-v2_5_0.xsd
+++ b/v2_5_0/CDT-deviceCapability-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="deviceCapability">
<xs:complexType>
diff --git a/v2_5_0/CDT-deviceInfo-v2_5_0.xsd b/v2_5_0/CDT-deviceInfo-v2_5_0.xsd
index fd2fda87b8b5d9fbbddf197ba7db65add30280da..7239c23040d13bce1bab103c865cec45a73af27b 100644
--- a/v2_5_0/CDT-deviceInfo-v2_5_0.xsd
+++ b/v2_5_0/CDT-deviceInfo-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="deviceInfo">
<xs:complexType>
diff --git a/v2_5_0/CDT-eventConfig-v2_5_0.xsd b/v2_5_0/CDT-eventConfig-v2_5_0.xsd
index 6f029ba03653da5aa611a7b43f84d251c92c1be7..1a926367048cf143483cadb8d2f6a1e84e5b33a4 100644
--- a/v2_5_0/CDT-eventConfig-v2_5_0.xsd
+++ b/v2_5_0/CDT-eventConfig-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="eventConfig">
<xs:complexType>
diff --git a/v2_5_0/CDT-eventLog-v2_5_0.xsd b/v2_5_0/CDT-eventLog-v2_5_0.xsd
index a620d0c6667f16d3d756c1dee9c88a5b1fe24cbf..7817cfc4903020eabdba6c5a8d9fd8bb6476376c 100644
--- a/v2_5_0/CDT-eventLog-v2_5_0.xsd
+++ b/v2_5_0/CDT-eventLog-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="eventLog">
<xs:complexType>
diff --git a/v2_5_0/CDT-execInstance-v2_5_0.xsd b/v2_5_0/CDT-execInstance-v2_5_0.xsd
index efd19f2f093007acfd6eb918f622a87ad90872cf..e4542fe1459e35ee5435576bc6bd394c7b16973d 100644
--- a/v2_5_0/CDT-execInstance-v2_5_0.xsd
+++ b/v2_5_0/CDT-execInstance-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="execInstance">
<xs:complexType>
diff --git a/v2_5_0/CDT-firmware-v2_5_0.xsd b/v2_5_0/CDT-firmware-v2_5_0.xsd
index b314411e8c9610a67f7b7e2299e03e155ebbd3f5..2800bf62f982cc9e2091e356cbd513b3d8908ed6 100644
--- a/v2_5_0/CDT-firmware-v2_5_0.xsd
+++ b/v2_5_0/CDT-firmware-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="firmware">
<xs:complexType>
diff --git a/v2_5_0/CDT-group-v2_5_0.xsd b/v2_5_0/CDT-group-v2_5_0.xsd
index f4b89fb5884f34d56f469c2062b58c12f427c98c..eec529ba57c2d8725c6ff7c845e72c183b15fabd 100644
--- a/v2_5_0/CDT-group-v2_5_0.xsd
+++ b/v2_5_0/CDT-group-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="group">
<xs:complexType>
diff --git a/v2_5_0/CDT-locationPolicy-v2_5_0.xsd b/v2_5_0/CDT-locationPolicy-v2_5_0.xsd
index 409e4446ac67d4b33559d9462bb4c0195e066853..9d65e979df7bcf29e092ddb127350f3f216cd10b 100644
--- a/v2_5_0/CDT-locationPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-locationPolicy-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="locationPolicy">
<xs:complexType>
diff --git a/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd b/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd
index 37deb72829a3d7e2ebe7d6d35fb739306ca31c43..12ad2815576a2a153576a2ec5f693273be82f058 100644
--- a/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd
+++ b/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_5_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile">
<xs:complexType>
diff --git a/v2_5_0/CDT-memory-v2_5_0.xsd b/v2_5_0/CDT-memory-v2_5_0.xsd
index cbe9a4706b4931146ebeb2edcb9dd4335d0349ab..006027d8508533c1c09f66f795248a7234150adb 100644
--- a/v2_5_0/CDT-memory-v2_5_0.xsd
+++ b/v2_5_0/CDT-memory-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="memory">
<xs:complexType>
diff --git a/v2_5_0/CDT-mgmtCmd-v2_5_0.xsd b/v2_5_0/CDT-mgmtCmd-v2_5_0.xsd
index 44c5f100cfb12b224fe4adf25f2fdae0cc06bfe7..76599a3212a6b9c7d025d4a53ee2d0bda1c24738 100644
--- a/v2_5_0/CDT-mgmtCmd-v2_5_0.xsd
+++ b/v2_5_0/CDT-mgmtCmd-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_5_0.xsd" />
<xs:element name="mgmtCmd">
<xs:complexType>
diff --git a/v2_5_0/CDT-node-v2_5_0.xsd b/v2_5_0/CDT-node-v2_5_0.xsd
index 950736129ade87b6aa24716f8abe74f483ce0d9f..2dc84050d47c6f48335d28245db73a1f133e4524 100644
--- a/v2_5_0/CDT-node-v2_5_0.xsd
+++ b/v2_5_0/CDT-node-v2_5_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_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:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="node">
<xs:complexType>
diff --git a/v2_5_0/CDT-notification-v2_5_0.xsd b/v2_5_0/CDT-notification-v2_5_0.xsd
index 1bed6d64d6e75620336a4c887f52dae00a6183be..8d5779698897117fdcb0777a6dcc16dfb9fa603b 100644
--- a/v2_5_0/CDT-notification-v2_5_0.xsd
+++ b/v2_5_0/CDT-notification-v2_5_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_4_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_5_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_5_0/CDT-pollingChannel-v2_5_0.xsd b/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
index 7eb713198f709136a2b3cf44e9a62803717a0009..b5cbba3bd5225cfb0dd56402e9ed95f5195ab836 100644
--- a/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
+++ b/v2_5_0/CDT-pollingChannel-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="pollingChannel">
<xs:complexType>
diff --git a/v2_5_0/CDT-reboot-v2_5_0.xsd b/v2_5_0/CDT-reboot-v2_5_0.xsd
index 84577fc872ced260b08a4964b1448bc844e387f0..3e918e520af23cacd513983a0ea6646363b2caf8 100644
--- a/v2_5_0/CDT-reboot-v2_5_0.xsd
+++ b/v2_5_0/CDT-reboot-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="reboot">
<xs:complexType>
diff --git a/v2_5_0/CDT-remoteCSE-v2_5_0.xsd b/v2_5_0/CDT-remoteCSE-v2_5_0.xsd
index d762cf6aa3809fd67f332a43d5f5aad87c69884d..153707ff23677d3162bc500aebb710c2984cb2d9 100644
--- a/v2_5_0/CDT-remoteCSE-v2_5_0.xsd
+++ b/v2_5_0/CDT-remoteCSE-v2_5_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_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:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_5_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
diff --git a/v2_5_0/CDT-request-v2_5_0.xsd b/v2_5_0/CDT-request-v2_5_0.xsd
index 7055c2b4d1315e2ff7cf7129f133ea94b48b9f1e..c7c1ced2369d71a49168a2285f3dc6c9535432cc 100644
--- a/v2_5_0/CDT-request-v2_5_0.xsd
+++ b/v2_5_0/CDT-request-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="request">
<xs:complexType>
diff --git a/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd b/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd
index a8c337dbea65de081498557fe458817305957d78..808dad71b5c06a86edf8b1e2272694522c78caef 100644
--- a/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd
+++ b/v2_5_0/CDT-requestPrimitive-v2_5_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_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd b/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
index adec6e7a62401a19dc6668692854d154028c6377..947151d316a1dd062dfb542d42faf0723716616e 100644
--- a/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
+++ b/v2_5_0/CDT-responsePrimitive-v2_5_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_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:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_5_0/CDT-schedule-v2_5_0.xsd b/v2_5_0/CDT-schedule-v2_5_0.xsd
index 584164317dfd00af94f0509015aa7355e2d765f1..38f0e4ed7dd67793cee98e7f61fcf161c79180b1 100644
--- a/v2_5_0/CDT-schedule-v2_5_0.xsd
+++ b/v2_5_0/CDT-schedule-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="schedule">
<xs:complexType>
diff --git a/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_0.xsd b/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_0.xsd
index c68124cbd5c469e55c67cbae752b08f1fea9066e..163bdc400523070cc6117cbfab8162275811c5f5 100644
--- a/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_0.xsd
+++ b/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="serviceSubscribedAppRule">
<xs:complexType>
diff --git a/v2_5_0/CDT-serviceSubscribedNode-v2_5_0.xsd b/v2_5_0/CDT-serviceSubscribedNode-v2_5_0.xsd
index 4125575ba82236860e5bd4564f421cd17c63ccc9..cf33097621393f6d26f5af1468c7538670061602 100644
--- a/v2_5_0/CDT-serviceSubscribedNode-v2_5_0.xsd
+++ b/v2_5_0/CDT-serviceSubscribedNode-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="serviceSubscribedNode">
<xs:complexType>
diff --git a/v2_5_0/CDT-software-v2_5_0.xsd b/v2_5_0/CDT-software-v2_5_0.xsd
index dccdb98f1df914e21ec594f9ecf0263b669e728f..606eff31a81223c38a1949767c555ce805d7800e 100644
--- a/v2_5_0/CDT-software-v2_5_0.xsd
+++ b/v2_5_0/CDT-software-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="software">
<xs:complexType>
diff --git a/v2_5_0/CDT-statsCollect-v2_5_0.xsd b/v2_5_0/CDT-statsCollect-v2_5_0.xsd
index 11aeb29505ee3618c6747dec67b6f1671dbeeaf3..c7ea68f52f21353402baefa21a0cf330793543e7 100644
--- a/v2_5_0/CDT-statsCollect-v2_5_0.xsd
+++ b/v2_5_0/CDT-statsCollect-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="statsCollect">
<xs:complexType>
diff --git a/v2_5_0/CDT-statsConfig-v2_5_0.xsd b/v2_5_0/CDT-statsConfig-v2_5_0.xsd
index 7715789be3328e3bd0e04203edfb982964a1294e..56c8fd4516c186eebd06b557aeef0e79d084d2b3 100644
--- a/v2_5_0/CDT-statsConfig-v2_5_0.xsd
+++ b/v2_5_0/CDT-statsConfig-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:element name="statsConfig">
<xs:complexType>
diff --git a/v2_5_0/CDT-subscription-v2_5_0.xsd b/v2_5_0/CDT-subscription-v2_5_0.xsd
index 7027ea4595579a4c92e0784cfe489268cfe7f2c2..b96a4682f3861b12fcb74b4b7e2f19d252ff988b 100644
--- a/v2_5_0/CDT-subscription-v2_5_0.xsd
+++ b/v2_5_0/CDT-subscription-v2_5_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_4_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
<xs:element name="subscription">
<xs:complexType>