diff --git a/v2_21_0/CDT-AE-v2_21_0.xsd b/v2_21_0/CDT-AE-v2_21_0.xsd
index 5757a925ad866247c541c30b1672cced2c341bdf..d0f74f9ca44def2cb1c05bfa6a8c340641d94516 100644
--- a/v2_21_0/CDT-AE-v2_21_0.xsd
+++ b/v2_21_0/CDT-AE-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_21_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-CSEBase-v2_21_0.xsd b/v2_21_0/CDT-CSEBase-v2_21_0.xsd
index be3455deaac1538a4de374b41e5dce4279300011..c5b5d6395e834cb8a24ebe4c455ddc502d47c98d 100644
--- a/v2_21_0/CDT-CSEBase-v2_21_0.xsd
+++ b/v2_21_0/CDT-CSEBase-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_21_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd b/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd
index 6dc4aaef5fe4ec909dcaebb58e5ced14331d5677..e80a4c7b82b5aca43f097a0c0e87f54555a0f19d 100644
--- a/v2_21_0/CDT-accessControlPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-accessControlPolicy-v2_21_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_20_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd b/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd
index 3721d99bfd84faae35b517d34ea09581ba57b467..8f8acd7c76f1a31f53f2635fe139638cfcb1dd24 100644
--- a/v2_21_0/CDT-activeCmdhPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-activeCmdhPolicy-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynApp-v2_21_0.xsd b/v2_21_0/CDT-allJoynApp-v2_21_0.xsd
index 44dab4187635a8c88706a651c3066a5450e871e5..6147020348edadb13a9238ee95daaa4a23f4238c 100644
--- a/v2_21_0/CDT-allJoynApp-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynApp-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_21_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd b/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd
index 6f9c8faecb13613c6d1b50fb1011c1d09d69e39b..051db6519bfa9cb4b58eb28559431618127904b4 100644
--- a/v2_21_0/CDT-allJoynInterface-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynInterface-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd b/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd
index d0408cd4c0b2e50661a193abc20a6c615ec34fd3..d157ee4342ce1fc7c2f48a4d8e904023865fa028 100644
--- a/v2_21_0/CDT-allJoynMethod-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynMethod-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_21_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd b/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd
index c6f9957848d020b0a4e7786549883748ea476822..d3502694bf98432f71ce61e0f792365d37e406ef 100644
--- a/v2_21_0/CDT-allJoynMethodCall-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynMethodCall-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd b/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd
index 4eff8b4b9a6d2be42f17a7ba5d282e18a3de6b94..592a05fdb9cf2adc70aef5c743cddba14e7a6606 100644
--- a/v2_21_0/CDT-allJoynProperty-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynProperty-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd b/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd
index e4a40613056a80a505333b353db3aa3b9106fe1c..5e79bb108b3f3581104774d951ec3ce016e30f59 100644
--- a/v2_21_0/CDT-allJoynSvcObject-v2_21_0.xsd
+++ b/v2_21_0/CDT-allJoynSvcObject-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_21_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd b/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd
index 9522c225e0f143f8bcdc5edb316cdfe3093d7cc9..0ac3615ac8146d9a4bf47b7ada12c6057ceaba13 100644
--- a/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_0.xsd
+++ b/v2_21_0/CDT-areaNwkDeviceInfo-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd b/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd
index 96921554b6f2bb530b9fce2689237c6e4c9a99c0..ddbf204811a2600c3ffd6e9ff00971b49ebc1382 100644
--- a/v2_21_0/CDT-areaNwkInfo-v2_21_0.xsd
+++ b/v2_21_0/CDT-areaNwkInfo-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-battery-v2_21_0.xsd b/v2_21_0/CDT-battery-v2_21_0.xsd
index 9cad9b87ef38b49c7132647daec5dd19640c2111..4bf5d12c758f8c0bb42145831dac240220a5fafd 100644
--- a/v2_21_0/CDT-battery-v2_21_0.xsd
+++ b/v2_21_0/CDT-battery-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd b/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd
index 3148be00e38dddaa05070c4c9fb1eb80d5b85608..f9907827ed96eebf95a21ad4c96ce4132e12a956 100644
--- a/v2_21_0/CDT-cmdhBuffer-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhBuffer-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd b/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd
index af4031dafd9d99745e1d382d05e1027424bfc388..d5e6ac64a9fa855dd17b2394c548b3fb0b2be62f 100644
--- a/v2_21_0/CDT-cmdhDefEcValue-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhDefEcValue-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd b/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd
index 5d0b62fa9c6cb12779baeecd00672dd7e1e3759d..16111ab5f5c6f4e7aa235eb07e9fbe8d966f59a3 100644
--- a/v2_21_0/CDT-cmdhDefaults-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhDefaults-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd b/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd
index 43246dbc8b19067007056e409d776f0d778a54fb..5b362242dd89c62fe6f51857fc707732d9a7499c 100644
--- a/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhEcDefParamValues-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd b/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd
index 44a76aa5284b73afb0b80b50d200a4140026406c..5fc4db413e04a0378297ff27d8e8272c94d6672a 100644
--- a/v2_21_0/CDT-cmdhLimits-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhLimits-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd b/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd
index 4ce76950074e2ee9902c4572430549b31bf409bc..f68635c849a7c823119a7dd231b670ef7fc7666f 100644
--- a/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhNetworkAccessRules-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd b/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd
index 7fbeaf8beefb6456ff7c431b70c371dd97b8ca91..4c2ed534bb0704b495e0be79942457e817913410 100644
--- a/v2_21_0/CDT-cmdhNwAccessRule-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhNwAccessRule-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd b/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd
index c80ef3ca2df95e4ff4257bcfe42800340591ef93..1d9976c50deaf90f3837bf212aa27d00ce13db7d 100644
--- a/v2_21_0/CDT-cmdhPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-cmdhPolicy-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-commonTypes-v2_21_0.xsd b/v2_21_0/CDT-commonTypes-v2_21_0.xsd
index 5ac40d19235d3f278b90411a364ea161894b3e10..35cd32971d294a3ecdf18c3f2d3c32d7bcf3716b 100644
--- a/v2_21_0/CDT-commonTypes-v2_21_0.xsd
+++ b/v2_21_0/CDT-commonTypes-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_21_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_21_0/CDT-container-v2_21_0.xsd b/v2_21_0/CDT-container-v2_21_0.xsd
index 990b5f44396d3c3adde6f1cf8852766ae6cc509f..e1da425db69cfde6c6d87d3fa2a42c717120e3a7 100644
--- a/v2_21_0/CDT-container-v2_21_0.xsd
+++ b/v2_21_0/CDT-container-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_21_0/CDT-contentInstance-v2_21_0.xsd b/v2_21_0/CDT-contentInstance-v2_21_0.xsd
index 9921ebc27b9f767e7b274720895cd93aee24ea6f..e0e0d4937a97f005fb2f8177636aea871757333d 100644
--- a/v2_21_0/CDT-contentInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-contentInstance-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-delivery-v2_21_0.xsd b/v2_21_0/CDT-delivery-v2_21_0.xsd
index 0ac651c023f21946991f8b0d0626daf988848466..fefacde6db62fc803b8aa7162c74c350efd87aff 100644
--- a/v2_21_0/CDT-delivery-v2_21_0.xsd
+++ b/v2_21_0/CDT-delivery-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_21_0/CDT-deviceCapability-v2_21_0.xsd b/v2_21_0/CDT-deviceCapability-v2_21_0.xsd
index 2dbe368bb73c040e7b81a485f23f9afc2d775d96..a87bd74a551affc3ffa5f484c23bd8e69922f9ec 100644
--- a/v2_21_0/CDT-deviceCapability-v2_21_0.xsd
+++ b/v2_21_0/CDT-deviceCapability-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-deviceInfo-v2_21_0.xsd b/v2_21_0/CDT-deviceInfo-v2_21_0.xsd
index 070f2a638473722b28c40fc05f7eee481ea68060..b9b37699dc71267ac62a45cf86005be581d985f9 100644
--- a/v2_21_0/CDT-deviceInfo-v2_21_0.xsd
+++ b/v2_21_0/CDT-deviceInfo-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd b/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd
index d8cc1bbc7ba275b0bab1c0ef67ab4d3da77403d8..947ba44863b9b4793c1304f823d04f75cc57bad3 100644
--- a/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_0.xsd
+++ b/v2_21_0/CDT-dynamicAuthorizationConsultation-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-eventConfig-v2_21_0.xsd b/v2_21_0/CDT-eventConfig-v2_21_0.xsd
index 5a8f2e61593c18512926a49b98905a93b22b5070..9acac0d3ba3282d807c5bd490a2c561ef6dd7530 100644
--- a/v2_21_0/CDT-eventConfig-v2_21_0.xsd
+++ b/v2_21_0/CDT-eventConfig-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-eventLog-v2_21_0.xsd b/v2_21_0/CDT-eventLog-v2_21_0.xsd
index 86b65936fa5e401018d4a40e4426fef0af9874dd..c01a85f8eb295a81ebf24e8e0ad8dff10e79612b 100644
--- a/v2_21_0/CDT-eventLog-v2_21_0.xsd
+++ b/v2_21_0/CDT-eventLog-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-execInstance-v2_21_0.xsd b/v2_21_0/CDT-execInstance-v2_21_0.xsd
index 6b2acfdf288d7004e0d2552387cc08205e6a995d..8f050db62b6dc7de001979e896e5727e9e9d0f95 100644
--- a/v2_21_0/CDT-execInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-execInstance-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-firmware-v2_21_0.xsd b/v2_21_0/CDT-firmware-v2_21_0.xsd
index 3178930a4fd750d2ac0009e41826db17de08189d..38d53b8cf2b8898f77f3038b313c2386ce4587ce 100644
--- a/v2_21_0/CDT-firmware-v2_21_0.xsd
+++ b/v2_21_0/CDT-firmware-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd b/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd
index f651391d9ed71b872b503973c8cc9a467a1d6c83..8395263f5af19e11a86bd5b9b66b102cbad6f871 100644
--- a/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-genericInterworkingOperationInstance-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd b/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd
index ccef5671de4bbc459a1771505d28be4202ccbca1..aa7e48d316d7275a793faaed5215f20df3dcbf34 100644
--- a/v2_21_0/CDT-genericInterworkingService-v2_21_0.xsd
+++ b/v2_21_0/CDT-genericInterworkingService-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_21_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-group-v2_21_0.xsd b/v2_21_0/CDT-group-v2_21_0.xsd
index 0aed183fd4a3b03dfe468e7cee7a7758489936f3..44f6d4727cfb8915186372754894ed5f53ef62a4 100644
--- a/v2_21_0/CDT-group-v2_21_0.xsd
+++ b/v2_21_0/CDT-group-v2_21_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
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_20_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd"/>
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd"/>
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-locationPolicy-v2_21_0.xsd b/v2_21_0/CDT-locationPolicy-v2_21_0.xsd
index 2221b7795665bcc1650b4e242d47b35c846dd5a0..3202e7dca8e3b80d003f95fa3e66a293b6db1629 100644
--- a/v2_21_0/CDT-locationPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-locationPolicy-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd b/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd
index ef85b32ba605e3272b4f3a616ef538dabfb8ac90..3ba3c09658c0013a8b3bb49bd130a557b5eb9827 100644
--- a/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd
+++ b/v2_21_0/CDT-m2mServiceSubscriptionProfile-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_21_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-memory-v2_21_0.xsd b/v2_21_0/CDT-memory-v2_21_0.xsd
index b0fbd3b4fb63da5ae3f4d44f86492a0abb1b0f21..0cad9546de63bd28c47f73c50b2e044add05806c 100644
--- a/v2_21_0/CDT-memory-v2_21_0.xsd
+++ b/v2_21_0/CDT-memory-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd b/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd
index 53869eebcb1507886ac613ae6a0c6a5f26e9a9eb..b259d3ef073579b0373f6d4796db5cc252fba841 100644
--- a/v2_21_0/CDT-mgmtCmd-v2_21_0.xsd
+++ b/v2_21_0/CDT-mgmtCmd-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_21_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-node-v2_21_0.xsd b/v2_21_0/CDT-node-v2_21_0.xsd
index 920547b96fb104b715545ab21fbd25b7daf5fb7f..24a5f109725cdeb8dc51dadb09504e1f861144f4 100644
--- a/v2_21_0/CDT-node-v2_21_0.xsd
+++ b/v2_21_0/CDT-node-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_21_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-notification-v2_21_0.xsd b/v2_21_0/CDT-notification-v2_21_0.xsd
index 6f2c4fb11833812dbcd8599ae2380df6bfb02138..995b592253c21a7f601148fc5ff93d9490feb829 100644
--- a/v2_21_0/CDT-notification-v2_21_0.xsd
+++ b/v2_21_0/CDT-notification-v2_21_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_20_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_21_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd b/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd
index b4680448e626f9dfb643d54e1a68775a43271b7a..d54f3e47752589b840f04afaeef1ee6cf7554a7f 100644
--- a/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd
+++ b/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd b/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd
index ce758e76991b18b173f9c76a1ab71b68a4560fe0..4afff9eeca5fb2ce973d8735798f4450c3b5357a 100644
--- a/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-notificationTargetPolicy-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd b/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd
index c44ee0e2ff1739a907e579f0ef73d33758154d1a..68c2514024a1e7abc06ab0896728e9478476d486 100644
--- a/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd
+++ b/v2_21_0/CDT-policyDeletionRules-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-pollingChannel-v2_21_0.xsd b/v2_21_0/CDT-pollingChannel-v2_21_0.xsd
index 5a5503e808f1857d93efa1269945d589cc3cd3ae..02722961aac1a78fdb06a58872e2dc3f34173cfa 100644
--- a/v2_21_0/CDT-pollingChannel-v2_21_0.xsd
+++ b/v2_21_0/CDT-pollingChannel-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-reboot-v2_21_0.xsd b/v2_21_0/CDT-reboot-v2_21_0.xsd
index a17bc20b8cccbed380054b516d8f4e5f1faf175e..4478eccd0d95648b88c7c478bb897e37ec2a0c0c 100644
--- a/v2_21_0/CDT-reboot-v2_21_0.xsd
+++ b/v2_21_0/CDT-reboot-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-remoteCSE-v2_21_0.xsd b/v2_21_0/CDT-remoteCSE-v2_21_0.xsd
index 35fe39a3c234b52e160768ef8198dc5842913fb9..177fd5a7a81aa71d7f06ef5853eee91559992c99 100644
--- a/v2_21_0/CDT-remoteCSE-v2_21_0.xsd
+++ b/v2_21_0/CDT-remoteCSE-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-request-v2_21_0.xsd b/v2_21_0/CDT-request-v2_21_0.xsd
index 7bda95650205c41c3f14ec61329f2044571e742e..e15cf6bef45c5161f3a558a0bb27d60f7cda9ac7 100644
--- a/v2_21_0/CDT-request-v2_21_0.xsd
+++ b/v2_21_0/CDT-request-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd b/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd
index 4996a1da223ba093de7a20507c22183e6c29a33b..b98bd152cad108777f4b7acfe6bb4634667e0bdd 100644
--- a/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd
+++ b/v2_21_0/CDT-requestPrimitive-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd b/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd
index 4b27d5d4751835de3c0f0b45b3e83de4ed7080a6..0de72d72edac1d6426f29688162432af4afa4f71 100644
--- a/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd
+++ b/v2_21_0/CDT-responsePrimitive-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_21_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_21_0/CDT-role-v2_21_0.xsd b/v2_21_0/CDT-role-v2_21_0.xsd
index 157b76f035ed058bc3f1d4d2eec8c008dce5cee2..a8af68244f9bd6ff6d6fb89878b054fcb5e74aa7 100644
--- a/v2_21_0/CDT-role-v2_21_0.xsd
+++ b/v2_21_0/CDT-role-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-schedule-v2_21_0.xsd b/v2_21_0/CDT-schedule-v2_21_0.xsd
index 08e1a2d3da082aa8578c26b65f308924baad2b8e..3a1ba47707edc90af4c0023cf7aac75e348b5435 100644
--- a/v2_21_0/CDT-schedule-v2_21_0.xsd
+++ b/v2_21_0/CDT-schedule-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd b/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd
index 06a7c920bee77e78de63b6b24a6fac0f634093ab..0a8183b681c29fc082952c7a0f9bb1619fd0621b 100644
--- a/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd
+++ b/v2_21_0/CDT-semanticDescriptor-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd b/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd
index 2c71abe70661a55fc0b5109d8391c694d9f23249..2cead83565122248ef1cb0b51225a1879d1cc27d 100644
--- a/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd
+++ b/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd b/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd
index b05cdc1aa75b208492888c37c1654df804a81a51..b50c5cdbdcdfe23dfd316f334645e3f4e0568e43 100644
--- a/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd
+++ b/v2_21_0/CDT-serviceSubscribedNode-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-software-v2_21_0.xsd b/v2_21_0/CDT-software-v2_21_0.xsd
index 13385497434f40906e7b9e5cb7f9174ff60d46d1..aa3002f1efdf9cc3866599d37c420d21ab9de977 100644
--- a/v2_21_0/CDT-software-v2_21_0.xsd
+++ b/v2_21_0/CDT-software-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-statsCollect-v2_21_0.xsd b/v2_21_0/CDT-statsCollect-v2_21_0.xsd
index d36b35ca3b80ccae72102d421f999a71f9972fbf..eb0f3734e10074929ed6a23cb55019e76cd52e5b 100644
--- a/v2_21_0/CDT-statsCollect-v2_21_0.xsd
+++ b/v2_21_0/CDT-statsCollect-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-statsConfig-v2_21_0.xsd b/v2_21_0/CDT-statsConfig-v2_21_0.xsd
index 8f62d2d56e5bcb922ab62d164f685095d8cceb3c..a86420ed5af09353b5904893abc8472dbb7dfb22 100644
--- a/v2_21_0/CDT-statsConfig-v2_21_0.xsd
+++ b/v2_21_0/CDT-statsConfig-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-subscription-v2_21_0.xsd b/v2_21_0/CDT-subscription-v2_21_0.xsd
index 55439ea0f481c0402bf7bd3dc50851fc99ca6a43..ab329c5203f3df0d0d074271fad91e144d491b18 100644
--- a/v2_21_0/CDT-subscription-v2_21_0.xsd
+++ b/v2_21_0/CDT-subscription-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd b/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd
index 22608ad1611281f3cd6b0e4afe0aaa4bbc1be58d..92e9c53858ac988e0ff23896e7b2ba2987f44a13 100644
--- a/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd
+++ b/v2_21_0/CDT-svcFwWrapper-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd b/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd
index a6b1c918ec4ad9ba6c68a0451e1e2e698651952d..96efaccf50929af83b144ff77aa6a82a75626aea 100644
--- a/v2_21_0/CDT-svcObjWrapper-v2_21_0.xsd
+++ b/v2_21_0/CDT-svcObjWrapper-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_21_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-timeSeries-v2_21_0.xsd b/v2_21_0/CDT-timeSeries-v2_21_0.xsd
index 10b13e77d6e170de8b4ded00437bf5d10741f183..8eb15db54f6716194071ad97d18ef1bff80e76d6 100644
--- a/v2_21_0/CDT-timeSeries-v2_21_0.xsd
+++ b/v2_21_0/CDT-timeSeries-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd b/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd
index abcda11690c73d9c76925345fbd70ddca448c353..5dc897ada0d20d9ec0763e08e6024d8589bd950b 100644
--- a/v2_21_0/CDT-timeSeriesInstance-v2_21_0.xsd
+++ b/v2_21_0/CDT-timeSeriesInstance-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-token-v2_21_0.xsd b/v2_21_0/CDT-token-v2_21_0.xsd
index 4839c67687eb658d7d0b5b0830830c135502e0e7..704fc1ef6c7bc41445932c9a3d5c4f53ca366c7c 100644
--- a/v2_21_0/CDT-token-v2_21_0.xsd
+++ b/v2_21_0/CDT-token-v2_21_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_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_21_0/CDT-trafficPattern-v2_21_0.xsd b/v2_21_0/CDT-trafficPattern-v2_21_0.xsd
index e921e01c1fc96595465d6cceb9d15d3ded0b6b6e..231dd585c9ce413818bf85cc90d3eb1048da3556 100644
--- a/v2_21_0/CDT-trafficPattern-v2_21_0.xsd
+++ b/v2_21_0/CDT-trafficPattern-v2_21_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_20_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>