diff --git a/v3_0_0/CDT-AE-v3_0_0.xsd b/v3_0_0/CDT-AE-v3_0_0.xsd
index b79c95e004d957e88df95d28c36eb7ac5adaa773..091410848650ea984d11c5ee693f49e672a86fed 100644
--- a/v3_0_0/CDT-AE-v3_0_0.xsd
+++ b/v3_0_0/CDT-AE-v3_0_0.xsd
@@ -26,16 +26,16 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-CSEBase-v3_0_0.xsd b/v3_0_0/CDT-CSEBase-v3_0_0.xsd
index f93179ac26c54ee595c718af6048cc247d1cff5d..7283a2a48cbe1d7573187e537866188a3dee6615 100644
--- a/v3_0_0/CDT-CSEBase-v3_0_0.xsd
+++ b/v3_0_0/CDT-CSEBase-v3_0_0.xsd
@@ -26,26 +26,26 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd b/v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd
index 64b5f4dc6c1e1060ffdfacbe420720ca357b4834..fa3ee59b0060888d47d9a7aada63a53656f2c06f 100644
--- a/v3_0_0/CDT-accessControlPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-accessControlPolicy-v3_0_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_10_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd b/v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd
index 610a452ecf843d41cb2ac1f49e4d90a5bb4b62bf..0846d2d7e2ef50345b6be4d18fb0d64f0ca4ac59 100644
--- a/v3_0_0/CDT-activeCmdhPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-activeCmdhPolicy-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynApp-v3_0_0.xsd b/v3_0_0/CDT-allJoynApp-v3_0_0.xsd
index 0476b1acd37289f08db67ea413abfb4ace0b26c6..b92b177404b567066698c25166ab904cd560c47b 100644
--- a/v3_0_0/CDT-allJoynApp-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynApp-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v3_0_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd b/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd
index bec19cff0fd3d7bd489bd845edcf8845870bf6fe..1b829b6b8f7b32f6fc2370e40bc1dc998272b17f 100644
--- a/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynInterface-v3_0_0.xsd
@@ -26,12 +26,12 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd b/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd
index cf2b548a5545e5fb7f526978b3a33e91cf8b308b..88bfce70983686b35f54f5371dd989b0e45ae8a4 100644
--- a/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynMethod-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v3_0_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd b/v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd
index c97d88b7fe2a29d6ca1b8d8f1e75f8ed1fa62104..2a8673557b4d53a56c5eb2c0b19b97deda6a11ad 100644
--- a/v3_0_0/CDT-allJoynMethodCall-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynMethodCall-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynProperty-v3_0_0.xsd b/v3_0_0/CDT-allJoynProperty-v3_0_0.xsd
index 2d3573b7a04e1dbd6fab2c05f33c149aabc466ca..233503f6466e36f6b3ebe870dd22b0b235575328 100644
--- a/v3_0_0/CDT-allJoynProperty-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynProperty-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd b/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd
index 145a9ff5735602c6c3e523454f60f4265765f3de..c7a93a7be6fc269ecd81ad2cef5c71866ade0445 100644
--- a/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd
+++ b/v3_0_0/CDT-allJoynSvcObject-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v3_0_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd b/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd
index 36a47cdac35d6b3f2f34a29e9bd7886d4d8fe01e..9eba7bc18d56c290e97459e60a2cf8941cd0a20e 100644
--- a/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_0.xsd
+++ b/v3_0_0/CDT-areaNwkDeviceInfo-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd b/v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd
index f672a158f9d636f15d3511c37e835032606970f1..1252401717dc9415ed0a1aba7ed29f17aabbfceb 100644
--- a/v3_0_0/CDT-areaNwkInfo-v3_0_0.xsd
+++ b/v3_0_0/CDT-areaNwkInfo-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-battery-v3_0_0.xsd b/v3_0_0/CDT-battery-v3_0_0.xsd
index 62abc25fb2970ab7a5b725ca906d46e39af6d25b..8d6770d118374b865947b761990de99e274b6f50 100644
--- a/v3_0_0/CDT-battery-v3_0_0.xsd
+++ b/v3_0_0/CDT-battery-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd b/v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd
index 901b3d1755e84c378824c7795c46811b18a80c8f..4c4821a3824d4e2cab12ae5319b484eeae31c4f8 100644
--- a/v3_0_0/CDT-cmdhBuffer-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhBuffer-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd b/v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd
index aa6ba591eb46e0b201cb9bdf6fb3286f2cf56dbd..b85cc45d85484ec8acb72978508751c9b91b2931 100644
--- a/v3_0_0/CDT-cmdhDefEcValue-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhDefEcValue-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd b/v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd
index 402bd81d2b43bdec029fd101d2e1c5f608657cfd..64a89fb4dbe1ec256b45259ce271955624443d7a 100644
--- a/v3_0_0/CDT-cmdhDefaults-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhDefaults-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd b/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd
index ab108a6d37a1f39f0b36cf1f1943712dcc615aa7..37a73695f02f29f73610549acee82813e2d3753c 100644
--- a/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhEcDefParamValues-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhLimits-v3_0_0.xsd b/v3_0_0/CDT-cmdhLimits-v3_0_0.xsd
index 69d47c509e51811520b54cd2fa52f5aedc2acf16..fdb3e8605f09bc4298fe14edd2ffbeff4f3f302e 100644
--- a/v3_0_0/CDT-cmdhLimits-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhLimits-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd b/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd
index b48f4683b40e555eb61efe99c004181b9606e19d..d79c6b16f3742ca91f8578c5d2be13338b2b5f41 100644
--- a/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd b/v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd
index 597491eefb89534347b72adfcb8af77209b028df..5d43bf1bfead955a52fece927fac1d7dccee8ef6 100644
--- a/v3_0_0/CDT-cmdhNwAccessRule-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhNwAccessRule-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd b/v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd
index 102ef1a62655febb47c5492ed74e676c788d3e68..f3a91b5679d0167989c27f098e221bfca49c7e85 100644
--- a/v3_0_0/CDT-cmdhPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-cmdhPolicy-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-commonTypes-v3_0_0.xsd b/v3_0_0/CDT-commonTypes-v3_0_0.xsd
index e703809bbe9e7df594373b8479392fd6d5b034af..286f73a6b6e6300b1eade82b2bb5403761756a8c 100644
--- a/v3_0_0/CDT-commonTypes-v3_0_0.xsd
+++ b/v3_0_0/CDT-commonTypes-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v3_0_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v3_0_0/CDT-container-v3_0_0.xsd b/v3_0_0/CDT-container-v3_0_0.xsd
index dc040aa80e1099d605e896705b8a25581cdca0fa..175833178074d1f2f61a8f17c4e28658bc587dbe 100644
--- a/v3_0_0/CDT-container-v3_0_0.xsd
+++ b/v3_0_0/CDT-container-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_0_0/CDT-contentInstance-v3_0_0.xsd b/v3_0_0/CDT-contentInstance-v3_0_0.xsd
index b521a67fd0d2618e6d9e613171559b0c3bcf3909..b04a3f07d8a8d470c77b5fccd6a51f4e6a0c3530 100644
--- a/v3_0_0/CDT-contentInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-contentInstance-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-delivery-v3_0_0.xsd b/v3_0_0/CDT-delivery-v3_0_0.xsd
index d18f9dda2e56d6c7929ad5ddbe0561b89fb62b36..9a55e5c7ff6879ecd6fa7f6683406eb7e1113add 100644
--- a/v3_0_0/CDT-delivery-v3_0_0.xsd
+++ b/v3_0_0/CDT-delivery-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_0_0/CDT-deviceCapability-v3_0_0.xsd b/v3_0_0/CDT-deviceCapability-v3_0_0.xsd
index 449a79657654e2acfe7ba3bd80dda108fec6262b..91e862aa1278a3e583f730308e31dbbb9519a9d6 100644
--- a/v3_0_0/CDT-deviceCapability-v3_0_0.xsd
+++ b/v3_0_0/CDT-deviceCapability-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-deviceInfo-v3_0_0.xsd b/v3_0_0/CDT-deviceInfo-v3_0_0.xsd
index d54c300ff3d5a826f6f162b9f04ed6cafa206b75..943210f06093f871fb63c5685f4dfbf406b702b6 100644
--- a/v3_0_0/CDT-deviceInfo-v3_0_0.xsd
+++ b/v3_0_0/CDT-deviceInfo-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd b/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd
index 98d5b2e4245661e4e963b586c5ec220b13cdbff2..b32c144d942e165de4abc77b1034ebd0e72c4d05 100644
--- a/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd
+++ b/v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_0.xsd
@@ -26,7 +26,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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-eventConfig-v3_0_0.xsd b/v3_0_0/CDT-eventConfig-v3_0_0.xsd
index 1ad1990faebeeb75a51e5360f07dc5ee193f6526..4c911ce59f44b94c62cef8a67c66299e630c443a 100644
--- a/v3_0_0/CDT-eventConfig-v3_0_0.xsd
+++ b/v3_0_0/CDT-eventConfig-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-eventLog-v3_0_0.xsd b/v3_0_0/CDT-eventLog-v3_0_0.xsd
index 2b158dc3983f1d63fa26d038113c5d8ce79b8e2f..3574d572116fd6ce2cedaed6a7c75df6c9c24deb 100644
--- a/v3_0_0/CDT-eventLog-v3_0_0.xsd
+++ b/v3_0_0/CDT-eventLog-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-execInstance-v3_0_0.xsd b/v3_0_0/CDT-execInstance-v3_0_0.xsd
index 364fa3b0a9808d2a8dcadd7c1a720cea246847cb..02f51a9efdf53dc2421ab18185037537f71d10d2 100644
--- a/v3_0_0/CDT-execInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-execInstance-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-firmware-v3_0_0.xsd b/v3_0_0/CDT-firmware-v3_0_0.xsd
index e319dcffec4b07f42ded28b87f470efab555e601..c3525e671aa0d2559e189ee935eae8d008157b4c 100644
--- a/v3_0_0/CDT-firmware-v3_0_0.xsd
+++ b/v3_0_0/CDT-firmware-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_0.xsd b/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_0.xsd
index 8bd47e0e314bd647396f8dd0ebb75570182d9a94..506d0195961cc1f7945e00c44050b4b4c7d8b522 100644
--- a/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd b/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd
index 8609599b3b7b269bc252ad9415d77458bb27cd89..2601eebe28f137bc3f55aad81c74fdb1ae78a874 100644
--- a/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd
+++ b/v3_0_0/CDT-genericInterworkingService-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_0_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-group-v3_0_0.xsd b/v3_0_0/CDT-group-v3_0_0.xsd
index c4439df2b7a6efe4c23c42d30801d3d5af85a931..4c85f8039d1ef86fb789ae58926e8c211113ac92 100644
--- a/v3_0_0/CDT-group-v3_0_0.xsd
+++ b/v3_0_0/CDT-group-v3_0_0.xsd
@@ -27,9 +27,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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-locationPolicy-v3_0_0.xsd b/v3_0_0/CDT-locationPolicy-v3_0_0.xsd
index 035443c5d2055da50fba4334e4d49b9ec298f9a6..23797dbd44e7ec048512dde86d78b03ef97745ff 100644
--- a/v3_0_0/CDT-locationPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-locationPolicy-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd b/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd
index aba43fee5962d9464174d73c14a1276159c3cff3..72a00090a9f5936460708a0e0e8371a3ca2dfa38 100644
--- a/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd
+++ b/v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-memory-v3_0_0.xsd b/v3_0_0/CDT-memory-v3_0_0.xsd
index 21fecf669205393970cc9b91cac453e12b110e93..15376be127a8eea1be1b6f04ea7b329c09adeec9 100644
--- a/v3_0_0/CDT-memory-v3_0_0.xsd
+++ b/v3_0_0/CDT-memory-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-mgmtCmd-v3_0_0.xsd b/v3_0_0/CDT-mgmtCmd-v3_0_0.xsd
index 61baaef251aec3c299fe46cca263e62c1aac6498..e4f687ff60600af292b079e92c4e830b6ac51cea 100644
--- a/v3_0_0/CDT-mgmtCmd-v3_0_0.xsd
+++ b/v3_0_0/CDT-mgmtCmd-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-node-v3_0_0.xsd b/v3_0_0/CDT-node-v3_0_0.xsd
index dc3058bff05bec32df141ed6fc8c710e0e9020bf..85cb5041a1a6960249d30d2cbcb7d5721115b20e 100644
--- a/v3_0_0/CDT-node-v3_0_0.xsd
+++ b/v3_0_0/CDT-node-v3_0_0.xsd
@@ -27,22 +27,22 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-notification-v3_0_0.xsd b/v3_0_0/CDT-notification-v3_0_0.xsd
index 048bd8d9f957cbbdb89b2db63e25391212735cee..f4f2a8436fe0ca5b020307640ab7adaefad4ca90 100644
--- a/v3_0_0/CDT-notification-v3_0_0.xsd
+++ b/v3_0_0/CDT-notification-v3_0_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_10_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd b/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd
index 1ff52d8c93f929c46c4752175ff0a94907863cf0..ff8c5f554fbdf8b3c041c4cd0c1128781e6c16b5 100644
--- a/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd
+++ b/v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-notificationTargetPolicy-v3_0_0.xsd b/v3_0_0/CDT-notificationTargetPolicy-v3_0_0.xsd
index 06fee4e9dd9c6aad83e55bdf7a0d2bde4cc3f1ef..e5fc8516faaf49662dad86d849d80d67fbfb86b3 100644
--- a/v3_0_0/CDT-notificationTargetPolicy-v3_0_0.xsd
+++ b/v3_0_0/CDT-notificationTargetPolicy-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd b/v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd
index 5562acaed0d47629324da64131f2f36dcb14ebac..25c55b8bd9d044c0545e1e26ad7481b3d1572930 100644
--- a/v3_0_0/CDT-policyDeletionRules-v3_0_0.xsd
+++ b/v3_0_0/CDT-policyDeletionRules-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-pollingChannel-v3_0_0.xsd b/v3_0_0/CDT-pollingChannel-v3_0_0.xsd
index 6f6eb65d0f1a057844ae90e7914350ac6fc1e750..43f73f94fb62bf14217800af47f73f8909b8eb09 100644
--- a/v3_0_0/CDT-pollingChannel-v3_0_0.xsd
+++ b/v3_0_0/CDT-pollingChannel-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-reboot-v3_0_0.xsd b/v3_0_0/CDT-reboot-v3_0_0.xsd
index 5d88191231e749b505ce455212a7c18dee21daee..382ea956a70d67219c7144989c30ee95b93b951e 100644
--- a/v3_0_0/CDT-reboot-v3_0_0.xsd
+++ b/v3_0_0/CDT-reboot-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-remoteCSE-v3_0_0.xsd b/v3_0_0/CDT-remoteCSE-v3_0_0.xsd
index 480597dfe311053688ba4cee2d2467f893e2fd04..24073b74c75e06b74641144b893967012b018b18 100644
--- a/v3_0_0/CDT-remoteCSE-v3_0_0.xsd
+++ b/v3_0_0/CDT-remoteCSE-v3_0_0.xsd
@@ -26,17 +26,17 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-request-v3_0_0.xsd b/v3_0_0/CDT-request-v3_0_0.xsd
index 2b0f99879776bd4c8c0c109ebf5f15b82417b23d..99c2700773606b5d13d0a82fdb2bb51dc733f28d 100644
--- a/v3_0_0/CDT-request-v3_0_0.xsd
+++ b/v3_0_0/CDT-request-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-requestPrimitive-v3_0_0.xsd b/v3_0_0/CDT-requestPrimitive-v3_0_0.xsd
index 119f0f89d366c980eb226ee1fbdd35a14acd32fa..e5a48a0e023162f78e0db5062df037304bfcbe47 100644
--- a/v3_0_0/CDT-requestPrimitive-v3_0_0.xsd
+++ b/v3_0_0/CDT-requestPrimitive-v3_0_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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd b/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd
index 464e07c4f24edc7649aedaf6288377bef57e660e..470d408e62a22d88e10daa0bae784b9fd3afb00b 100644
--- a/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd
+++ b/v3_0_0/CDT-responsePrimitive-v3_0_0.xsd
@@ -28,55 +28,55 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v3_0_0/CDT-role-v3_0_0.xsd b/v3_0_0/CDT-role-v3_0_0.xsd
index aff89ad2aa1b987a997af0ffe8dd037a08e2aac2..0b65e0dd4766f17bb2d5fd4a24b1634370e693ce 100644
--- a/v3_0_0/CDT-role-v3_0_0.xsd
+++ b/v3_0_0/CDT-role-v3_0_0.xsd
@@ -26,7 +26,7 @@ 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-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-schedule-v3_0_0.xsd b/v3_0_0/CDT-schedule-v3_0_0.xsd
index 7e8156be1c20358a83ef40741a39be162fc17160..95e3f9c3e742cb44f56f9d4757cb3a662ce7c9b2 100644
--- a/v3_0_0/CDT-schedule-v3_0_0.xsd
+++ b/v3_0_0/CDT-schedule-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd b/v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd
index 6dedc8378d97d9631a297ac527da2d8eed94d6d7..a1bac6d75b821656414f61d3c43847a399bbb31d 100644
--- a/v3_0_0/CDT-semanticDescriptor-v3_0_0.xsd
+++ b/v3_0_0/CDT-semanticDescriptor-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_0.xsd b/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_0.xsd
index 568c458357f71e04b056eaecaeda39da069033cd..dac20e56482460cecd196f8d8c82ec75c2959107 100644
--- a/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_0.xsd
+++ b/v3_0_0/CDT-serviceSubscribedAppRule-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd b/v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd
index 8e08894023c732142e7223a695e570e74eb0fd62..b2d8786a5021e77a22e52fd19d2d455e9c9b10c1 100644
--- a/v3_0_0/CDT-serviceSubscribedNode-v3_0_0.xsd
+++ b/v3_0_0/CDT-serviceSubscribedNode-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-software-v3_0_0.xsd b/v3_0_0/CDT-software-v3_0_0.xsd
index 1be2e304186dab1b559c4678f4c7457c7f6ee875..0e01a2962e1af846d1ae484b37aa6957f923895b 100644
--- a/v3_0_0/CDT-software-v3_0_0.xsd
+++ b/v3_0_0/CDT-software-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-statsCollect-v3_0_0.xsd b/v3_0_0/CDT-statsCollect-v3_0_0.xsd
index 6e2f649062d2e42be5fc8b1eb51562380338d4ec..5101e4f508360ad87719915e7dac0570d4a6d560 100644
--- a/v3_0_0/CDT-statsCollect-v3_0_0.xsd
+++ b/v3_0_0/CDT-statsCollect-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-statsConfig-v3_0_0.xsd b/v3_0_0/CDT-statsConfig-v3_0_0.xsd
index 89c59deb2422cb2e330883c7449b27e9c5172991..84805cc8ac0c52c97dcb0a29ca4ad43bd478383c 100644
--- a/v3_0_0/CDT-statsConfig-v3_0_0.xsd
+++ b/v3_0_0/CDT-statsConfig-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-subscription-v3_0_0.xsd b/v3_0_0/CDT-subscription-v3_0_0.xsd
index 683fdfb552aaadc1bf5efdc021e520ee2efad8d2..063d3cd2334bb0fbf0858a9664d71a439af97b15 100644
--- a/v3_0_0/CDT-subscription-v3_0_0.xsd
+++ b/v3_0_0/CDT-subscription-v3_0_0.xsd
@@ -27,9 +27,9 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_0_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd b/v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd
index 242bd367c04cbedbdad0a639ba764c80db4a63c7..084e18e95ae6e869e45bb76230f9869219eeffeb 100644
--- a/v3_0_0/CDT-svcFwWrapper-v3_0_0.xsd
+++ b/v3_0_0/CDT-svcFwWrapper-v3_0_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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd b/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd
index e99835090b3357cede7e1059808ab2763bd249c4..ee61b781ec924006bd3b2481cab393f8a17d5a0f 100644
--- a/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd
+++ b/v3_0_0/CDT-svcObjWrapper-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v3_0_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-timeSeries-v3_0_0.xsd b/v3_0_0/CDT-timeSeries-v3_0_0.xsd
index db997f6e43d73f9793efac52a74b9c37c7901d7b..b1949cbdd2b9567927ad57aef5e06c0e38aa7406 100644
--- a/v3_0_0/CDT-timeSeries-v3_0_0.xsd
+++ b/v3_0_0/CDT-timeSeries-v3_0_0.xsd
@@ -26,10 +26,10 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd b/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd
index 8081f5fa29fb69d09551ab0d1510212230559e26..4faa91b16d5396350148c086762c9138b5dd1655 100644
--- a/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd
+++ b/v3_0_0/CDT-timeSeriesInstance-v3_0_0.xsd
@@ -26,7 +26,7 @@ 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_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-token-v3_0_0.xsd b/v3_0_0/CDT-token-v3_0_0.xsd
index 44fa13fff6545ab7e9ec491ae9ae5c7b53bef9cd..4300b9cf17f4c4aa7b9afcff0b32abcaefdf54b0 100644
--- a/v3_0_0/CDT-token-v3_0_0.xsd
+++ b/v3_0_0/CDT-token-v3_0_0.xsd
@@ -26,7 +26,7 @@ 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-subscription-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v3_0_0/CDT-trafficPattern-v3_0_0.xsd b/v3_0_0/CDT-trafficPattern-v3_0_0.xsd
index 408b97786e3b250f47142ba142a1d81065c1dcb0..d463acbe8a9876b78af221a0e0983afd0692f382 100644
--- a/v3_0_0/CDT-trafficPattern-v3_0_0.xsd
+++ b/v3_0_0/CDT-trafficPattern-v3_0_0.xsd
@@ -27,9 +27,9 @@ 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_10_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>