diff --git a/v2_0_0/CDT-AE-v2_0_0.xsd b/v2_0_0/CDT-AE-v2_0_0.xsd
index 7056edcfe0ebb262fb9072eca5a11c1535ccdaaf..744a948cf0998971880111fb2a601f3697cef310 100644
--- a/v2_0_0/CDT-AE-v2_0_0.xsd
+++ b/v2_0_0/CDT-AE-v2_0_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
<xs:element name="AE">
<xs:complexType>
diff --git a/v2_0_0/CDT-CSEBase-v2_0_0.xsd b/v2_0_0/CDT-CSEBase-v2_0_0.xsd
index 92b0bccb1a678fc43db3ff225b42c445c4ddb20e..129e96cb1814b5b97fb5f8ffc058b22e47d5aeda 100644
--- a/v2_0_0/CDT-CSEBase-v2_0_0.xsd
+++ b/v2_0_0/CDT-CSEBase-v2_0_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-node-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-request-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_0_0.xsd" />
<xs:element name="CSEBase">
<xs:complexType>
diff --git a/v2_0_0/CDT-accessControlPolicy-v2_0_0.xsd b/v2_0_0/CDT-accessControlPolicy-v2_0_0.xsd
index 4b7fb26c2c52b94b8f173d9116d827942c34ca32..b93af984d38d8e7fd3121f8480c60a0b8d6b2e80 100644
--- a/v2_0_0/CDT-accessControlPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-accessControlPolicy-v2_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-v1_3_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd"/>
<xs:element name="accessControlPolicy">
<xs:complexType>
diff --git a/v2_0_0/CDT-activeCmdhPolicy-v2_0_0.xsd b/v2_0_0/CDT-activeCmdhPolicy-v2_0_0.xsd
index da75e5e7257fdd06543e49f986aeb77f13b58e74..8d6fe6d3dd0cac1498d50817fd6992d3de64db05 100644
--- a/v2_0_0/CDT-activeCmdhPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-activeCmdhPolicy-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="activeCmdhPolicy">
<xs:complexType>
diff --git a/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_0.xsd b/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_0.xsd
index 14d51992755101617cde6ba65bf509467a8c4a73..43a8804639c1966fce0cb48b0f35a3892d06a315 100644
--- a/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_0.xsd
+++ b/v2_0_0/CDT-areaNwkDeviceInfo-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="areaNwkDeviceInfo">
<xs:complexType>
diff --git a/v2_0_0/CDT-areaNwkInfo-v2_0_0.xsd b/v2_0_0/CDT-areaNwkInfo-v2_0_0.xsd
index f0861c18e366c79567d546e0291dccaf386868b3..ddbacf94c66ba474e8cb589c1dc8c830c1aee241 100644
--- a/v2_0_0/CDT-areaNwkInfo-v2_0_0.xsd
+++ b/v2_0_0/CDT-areaNwkInfo-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="areaNwkInfo">
<xs:complexType>
diff --git a/v2_0_0/CDT-battery-v2_0_0.xsd b/v2_0_0/CDT-battery-v2_0_0.xsd
index cec9f92a3e8baa8c9998ca76a104b9562915a37b..dfa961f34550feacc8d516ba21c17d91ef579ec4 100644
--- a/v2_0_0/CDT-battery-v2_0_0.xsd
+++ b/v2_0_0/CDT-battery-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="battery">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhBuffer-v2_0_0.xsd b/v2_0_0/CDT-cmdhBuffer-v2_0_0.xsd
index e2613af2d9faf2a36d05bbc7faac124423447167..e1ae430be62fb20a2ab59b2bbcbd6cac8812d83c 100644
--- a/v2_0_0/CDT-cmdhBuffer-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhBuffer-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhBuffer">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhDefEcValue-v2_0_0.xsd b/v2_0_0/CDT-cmdhDefEcValue-v2_0_0.xsd
index db5805a1db4ce68f340e414135e6b3f5f0e3f9f5..d48706cea3db1654d273f69a837effed91ae1577 100644
--- a/v2_0_0/CDT-cmdhDefEcValue-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhDefEcValue-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhDefEcValue">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhDefaults-v2_0_0.xsd b/v2_0_0/CDT-cmdhDefaults-v2_0_0.xsd
index d4915e843ab32e31bd6670d590681892f98ddfe7..f262ef18974a3fd2de86ca7909b1f28e1f38ff5f 100644
--- a/v2_0_0/CDT-cmdhDefaults-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhDefaults-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhDefaults">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_0.xsd b/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_0.xsd
index c10fe1f0276421d778a41f658e21cbf7b533d239..ff140d3325237066cd1e7095bc4b26a51188c5bf 100644
--- a/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhEcDefParamValues-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhEcDefParamValues">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhLimits-v2_0_0.xsd b/v2_0_0/CDT-cmdhLimits-v2_0_0.xsd
index deeac6aa4eb275ebbf923aada95b15df5fdbf1a5..faf86b743436481a4b505e1d3b7cbf0fac8de47e 100644
--- a/v2_0_0/CDT-cmdhLimits-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhLimits-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhLimits">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_0.xsd b/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_0.xsd
index 37fa67ecefa47f0901a8e834e450959d44e03725..afffc467830046cbe82e577f690f6f79670586a2 100644
--- a/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhNetworkAccessRules-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhNetworkAccessRules">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhNwAccessRule-v2_0_0.xsd b/v2_0_0/CDT-cmdhNwAccessRule-v2_0_0.xsd
index b4f02bd92d91d87e384bdb7df41510bb1c9743ee..13840868bc7a6fbff2968a459b6680a5d2defe2e 100644
--- a/v2_0_0/CDT-cmdhNwAccessRule-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhNwAccessRule-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhNwAccessRule">
<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhPolicy-v2_0_0.xsd b/v2_0_0/CDT-cmdhPolicy-v2_0_0.xsd
index 2e8967c2545f8d5d80611285c1ecdc7774b89bb2..bcce2f1fb91df80332bf6b3755e6ccae4f74efe0 100644
--- a/v2_0_0/CDT-cmdhPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhPolicy-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="cmdhPolicy" >
<xs:complexType>
diff --git a/v2_0_0/CDT-commonTypes-v2_0_0.xsd b/v2_0_0/CDT-commonTypes-v2_0_0.xsd
index 4009ecf75254cb2a7682dc24ff288bf74fbbc534..d3ece9aebb81ef5a9eec0d121c04d5e299c38e61 100644
--- a/v2_0_0/CDT-commonTypes-v2_0_0.xsd
+++ b/v2_0_0/CDT-commonTypes-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_0_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_0_0/CDT-container-v2_0_0.xsd b/v2_0_0/CDT-container-v2_0_0.xsd
index 329340ad1af35bd41ddd86e541f0b2b33c4ec6da..0bf19a5703a640dc0adb114def82848bae4ec22d 100644
--- a/v2_0_0/CDT-container-v2_0_0.xsd
+++ b/v2_0_0/CDT-container-v2_0_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="container">
<xs:complexType>
diff --git a/v2_0_0/CDT-contentInstance-v2_0_0.xsd b/v2_0_0/CDT-contentInstance-v2_0_0.xsd
index a4a3e3670d219d98ecd4ad3ee2b719bd7044a553..0bd49c5c05497522a487e43704dbfde2f92cd9a0 100644
--- a/v2_0_0/CDT-contentInstance-v2_0_0.xsd
+++ b/v2_0_0/CDT-contentInstance-v2_0_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="contentInstance">
<xs:complexType>
diff --git a/v2_0_0/CDT-delivery-v2_0_0.xsd b/v2_0_0/CDT-delivery-v2_0_0.xsd
index ebc9c8af02773062256a47a7fee7b54bbeebba80..a370310fdff363101a60e58d9240290317cf2120 100644
--- a/v2_0_0/CDT-delivery-v2_0_0.xsd
+++ b/v2_0_0/CDT-delivery-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="delivery">
diff --git a/v2_0_0/CDT-deviceCapability-v2_0_0.xsd b/v2_0_0/CDT-deviceCapability-v2_0_0.xsd
index bfaa5a893a36962f222b164c9bf175d62d508ddb..64a68d1e34f88e61e5f27cf42755ec9f664d134c 100644
--- a/v2_0_0/CDT-deviceCapability-v2_0_0.xsd
+++ b/v2_0_0/CDT-deviceCapability-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="deviceCapability">
<xs:complexType>
diff --git a/v2_0_0/CDT-deviceInfo-v2_0_0.xsd b/v2_0_0/CDT-deviceInfo-v2_0_0.xsd
index a8b2f713e8b22ac52f901585c1c5205fa387c6a5..282159eb97c06e270ec4d3b7f90bf06078112a07 100644
--- a/v2_0_0/CDT-deviceInfo-v2_0_0.xsd
+++ b/v2_0_0/CDT-deviceInfo-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="deviceInfo">
<xs:complexType>
diff --git a/v2_0_0/CDT-eventConfig-v2_0_0.xsd b/v2_0_0/CDT-eventConfig-v2_0_0.xsd
index 1c6274e39eb349b173dc20e52395716250c0ee40..6cf3471f2c39c80a8c7adeb0302e1a382d346e65 100644
--- a/v2_0_0/CDT-eventConfig-v2_0_0.xsd
+++ b/v2_0_0/CDT-eventConfig-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="eventConfig">
<xs:complexType>
diff --git a/v2_0_0/CDT-eventLog-v2_0_0.xsd b/v2_0_0/CDT-eventLog-v2_0_0.xsd
index 5ccb02293fc191da9f10a3171c197cd354dd1a0c..63029b5594dd7bf861c8abca47566f37f2d80716 100644
--- a/v2_0_0/CDT-eventLog-v2_0_0.xsd
+++ b/v2_0_0/CDT-eventLog-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="eventLog">
<xs:complexType>
diff --git a/v2_0_0/CDT-execInstance-v2_0_0.xsd b/v2_0_0/CDT-execInstance-v2_0_0.xsd
index 45f30d8e7e1a0dabac65ddf711c8e146284f0819..7f0d9feb99d8a9c6b1ad53873c158d328fb08eaf 100644
--- a/v2_0_0/CDT-execInstance-v2_0_0.xsd
+++ b/v2_0_0/CDT-execInstance-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="execInstance">
<xs:complexType>
diff --git a/v2_0_0/CDT-firmware-v2_0_0.xsd b/v2_0_0/CDT-firmware-v2_0_0.xsd
index 2a3409d7c282fb386305fc8ed6828a794fae9615..946aef279d33468c51a98bbf70299d6172941623 100644
--- a/v2_0_0/CDT-firmware-v2_0_0.xsd
+++ b/v2_0_0/CDT-firmware-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="firmware">
<xs:complexType>
diff --git a/v2_0_0/CDT-group-v2_0_0.xsd b/v2_0_0/CDT-group-v2_0_0.xsd
index 70adc8f500c2b15cc1fa4aff4bbdcc2efa593d77..6cb57976a8f913c0fa4689f9e235be107f25bb2f 100644
--- a/v2_0_0/CDT-group-v2_0_0.xsd
+++ b/v2_0_0/CDT-group-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="group">
<xs:complexType>
diff --git a/v2_0_0/CDT-locationPolicy-v2_0_0.xsd b/v2_0_0/CDT-locationPolicy-v2_0_0.xsd
index 51997fd062ae09a3286d04d0dde9f5aaa9f39452..d2f17f6825d4bf1e09721e33c0d391bf401d95f7 100644
--- a/v2_0_0/CDT-locationPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-locationPolicy-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="locationPolicy">
<xs:complexType>
diff --git a/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd b/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd
index 3be20659ab2c3ff52fb1758a7db0ce9cf303be99..9c37282936d4cbd6cc035653d6cac6d09605748c 100644
--- a/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd
+++ b/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_0_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile">
<xs:complexType>
diff --git a/v2_0_0/CDT-memory-v2_0_0.xsd b/v2_0_0/CDT-memory-v2_0_0.xsd
index e4ad7dd3f3f9ed6485fea1809c8ea82be82a65da..7ebcdc01f5fd85be4202884d1b56864e86df767d 100644
--- a/v2_0_0/CDT-memory-v2_0_0.xsd
+++ b/v2_0_0/CDT-memory-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="memory">
<xs:complexType>
diff --git a/v2_0_0/CDT-mgmtCmd-v2_0_0.xsd b/v2_0_0/CDT-mgmtCmd-v2_0_0.xsd
index 95fd009b5d991dd307e29aecde0d900911411214..c637adcc173151de0c8a3447c6ac27876ebbabdf 100644
--- a/v2_0_0/CDT-mgmtCmd-v2_0_0.xsd
+++ b/v2_0_0/CDT-mgmtCmd-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_0_0.xsd" />
<xs:element name="mgmtCmd">
<xs:complexType>
diff --git a/v2_0_0/CDT-node-v2_0_0.xsd b/v2_0_0/CDT-node-v2_0_0.xsd
index 321c4d05bf56ddd273223aa08d0be8ac88f09507..805c183c2ce6dc05d3a511c82f85dc4aadca0d54 100644
--- a/v2_0_0/CDT-node-v2_0_0.xsd
+++ b/v2_0_0/CDT-node-v2_0_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-software-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="node">
<xs:complexType>
diff --git a/v2_0_0/CDT-notification-v2_0_0.xsd b/v2_0_0/CDT-notification-v2_0_0.xsd
index b30dc251b7494e0d0565ccaaae76d5adab91f33f..5ccfc52559d406aed0a56335051147721b78f1f8 100644
--- a/v2_0_0/CDT-notification-v2_0_0.xsd
+++ b/v2_0_0/CDT-notification-v2_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-v1_3_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v1_3_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_0_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_0_0/CDT-pollingChannel-v2_0_0.xsd b/v2_0_0/CDT-pollingChannel-v2_0_0.xsd
index 26a9a20520ee19293bf076d20b6eedc6001e9a34..5c7bf016133ee55d669e2fc2063d3e65d3c50f56 100644
--- a/v2_0_0/CDT-pollingChannel-v2_0_0.xsd
+++ b/v2_0_0/CDT-pollingChannel-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="pollingChannel">
<xs:complexType>
diff --git a/v2_0_0/CDT-reboot-v2_0_0.xsd b/v2_0_0/CDT-reboot-v2_0_0.xsd
index e5d03c9640cd4d1e054a14ebedc9538b49a52e7c..a6387904be40a3ce2cbcbdba7f0fe443cecb7318 100644
--- a/v2_0_0/CDT-reboot-v2_0_0.xsd
+++ b/v2_0_0/CDT-reboot-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="reboot">
<xs:complexType>
diff --git a/v2_0_0/CDT-remoteCSE-v2_0_0.xsd b/v2_0_0/CDT-remoteCSE-v2_0_0.xsd
index 0bb024aeccb434a95a14581e1464875b711aa431..ec6911c1550c4e07249e287cf3a399718ab2f8c2 100644
--- a/v2_0_0/CDT-remoteCSE-v2_0_0.xsd
+++ b/v2_0_0/CDT-remoteCSE-v2_0_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-node-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_0_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
diff --git a/v2_0_0/CDT-request-v2_0_0.xsd b/v2_0_0/CDT-request-v2_0_0.xsd
index 9d005b3a68a2ea60140a51a25b2157d5dff557a6..022693da236692dd35364256c418f31da3416698 100644
--- a/v2_0_0/CDT-request-v2_0_0.xsd
+++ b/v2_0_0/CDT-request-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="request">
<xs:complexType>
diff --git a/v2_0_0/CDT-requestPrimitive-v2_0_0.xsd b/v2_0_0/CDT-requestPrimitive-v2_0_0.xsd
index 25c66395ea33d613220f1bf3131f0c973bb0aee8..d58dd5b456661f4c217f45ae884d9be86c458f4a 100644
--- a/v2_0_0/CDT-requestPrimitive-v2_0_0.xsd
+++ b/v2_0_0/CDT-requestPrimitive-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_0_0/CDT-responsePrimitive-v2_0_0.xsd b/v2_0_0/CDT-responsePrimitive-v2_0_0.xsd
index 9aa98c9605fbb4c91610450d2bf45be58fb00240..590bd2fac7e2230f90ca4b5c5dd4d8b38aacc8c8 100644
--- a/v2_0_0/CDT-responsePrimitive-v2_0_0.xsd
+++ b/v2_0_0/CDT-responsePrimitive-v2_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-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_0_0/CDT-schedule-v2_0_0.xsd b/v2_0_0/CDT-schedule-v2_0_0.xsd
index a7eefd81f3afa359863e5fc2ad266ed2a2002f04..c07e870ad9b242570bfb7bbc185b819a7a117bda 100644
--- a/v2_0_0/CDT-schedule-v2_0_0.xsd
+++ b/v2_0_0/CDT-schedule-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="schedule">
<xs:complexType>
diff --git a/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_0.xsd b/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_0.xsd
index 2fdbf3cd65610b6eeec5133e3f6153fbb92e2663..d7321a1b11acdf4e8517db0fc2fdded2a877b09e 100644
--- a/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_0.xsd
+++ b/v2_0_0/CDT-serviceSubscribedAppRule-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="serviceSubscribedAppRule">
<xs:complexType>
diff --git a/v2_0_0/CDT-serviceSubscribedNode-v2_0_0.xsd b/v2_0_0/CDT-serviceSubscribedNode-v2_0_0.xsd
index 377fb5055a401ca36fcfd6439a72622fcaf42474..aebd02b2796e94295b49c0c32db32423ca02c698 100644
--- a/v2_0_0/CDT-serviceSubscribedNode-v2_0_0.xsd
+++ b/v2_0_0/CDT-serviceSubscribedNode-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="serviceSubscribedNode">
<xs:complexType>
diff --git a/v2_0_0/CDT-software-v2_0_0.xsd b/v2_0_0/CDT-software-v2_0_0.xsd
index 00189b35f9987488d79809d8849b13bf085122a7..ffda8b25242fadec2e055e5faef24b45263f0aa6 100644
--- a/v2_0_0/CDT-software-v2_0_0.xsd
+++ b/v2_0_0/CDT-software-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="software">
<xs:complexType>
diff --git a/v2_0_0/CDT-statsCollect-v2_0_0.xsd b/v2_0_0/CDT-statsCollect-v2_0_0.xsd
index 736d3acea8e6f062eebab04922a80810feab56d2..362dd805335f87cbf0df36e4c9b328c959d887f7 100644
--- a/v2_0_0/CDT-statsCollect-v2_0_0.xsd
+++ b/v2_0_0/CDT-statsCollect-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="statsCollect">
<xs:complexType>
diff --git a/v2_0_0/CDT-statsConfig-v2_0_0.xsd b/v2_0_0/CDT-statsConfig-v2_0_0.xsd
index 8c7f02d2f3133f4bc07488ff8d8fae72adeb5d94..160cb200ace8db8edbec4fbf47299d27cdf37012 100644
--- a/v2_0_0/CDT-statsConfig-v2_0_0.xsd
+++ b/v2_0_0/CDT-statsConfig-v2_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
<xs:element name="statsConfig">
<xs:complexType>
diff --git a/v2_0_0/CDT-subscription-v2_0_0.xsd b/v2_0_0/CDT-subscription-v2_0_0.xsd
index c487f5171956436c3444831ac0b390c9bd3e9776..adc445e477868c0742a064c4f33c32f3db6fd57f 100644
--- a/v2_0_0/CDT-subscription-v2_0_0.xsd
+++ b/v2_0_0/CDT-subscription-v2_0_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-v1_3_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
<xs:element name="subscription">
<xs:complexType>