diff --git a/v2_20_0/CDT-AE-v2_20_0.xsd b/v2_20_0/CDT-AE-v2_20_0.xsd
index 6d63ef962f2fdca1e634c37960accacb30a22f60..5757a925ad866247c541c30b1672cced2c341bdf 100644
--- a/v2_20_0/CDT-AE-v2_20_0.xsd
+++ b/v2_20_0/CDT-AE-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_19_0.xsd" />
+ <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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-CSEBase-v2_20_0.xsd b/v2_20_0/CDT-CSEBase-v2_20_0.xsd
index a69010a00d696fca8eb6cf4c714915f02eddbf9d..be3455deaac1538a4de374b41e5dce4279300011 100644
--- a/v2_20_0/CDT-CSEBase-v2_20_0.xsd
+++ b/v2_20_0/CDT-CSEBase-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_19_0.xsd" />
+ <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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_20_0/CDT-accessControlPolicy-v2_20_0.xsd b/v2_20_0/CDT-accessControlPolicy-v2_20_0.xsd
index 3af76d70471129de13f9166b04f8a48137b8d99e..6dc4aaef5fe4ec909dcaebb58e5ced14331d5677 100644
--- a/v2_20_0/CDT-accessControlPolicy-v2_20_0.xsd
+++ b/v2_20_0/CDT-accessControlPolicy-v2_20_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_19_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-activeCmdhPolicy-v2_20_0.xsd b/v2_20_0/CDT-activeCmdhPolicy-v2_20_0.xsd
index e152245b312e4c14cde844a8e243985d42f8359b..3721d99bfd84faae35b517d34ea09581ba57b467 100644
--- a/v2_20_0/CDT-activeCmdhPolicy-v2_20_0.xsd
+++ b/v2_20_0/CDT-activeCmdhPolicy-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-allJoynApp-v2_20_0.xsd b/v2_20_0/CDT-allJoynApp-v2_20_0.xsd
index ba56f7be6dcd6e99dc6ffca44316194afbe47a36..44dab4187635a8c88706a651c3066a5450e871e5 100644
--- a/v2_20_0/CDT-allJoynApp-v2_20_0.xsd
+++ b/v2_20_0/CDT-allJoynApp-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_19_0.xsd" />
+ <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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-allJoynInterface-v2_20_0.xsd b/v2_20_0/CDT-allJoynInterface-v2_20_0.xsd
index d8355de1fe51dd79ab080bd89624d25edebc3e13..6f9c8faecb13613c6d1b50fb1011c1d09d69e39b 100644
--- a/v2_20_0/CDT-allJoynInterface-v2_20_0.xsd
+++ b/v2_20_0/CDT-allJoynInterface-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
+ <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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_20_0/CDT-allJoynMethod-v2_20_0.xsd b/v2_20_0/CDT-allJoynMethod-v2_20_0.xsd
index 79f57af6c3ac7af44e355a3e69c1faa3d0938e28..d0408cd4c0b2e50661a193abc20a6c615ec34fd3 100644
--- a/v2_20_0/CDT-allJoynMethod-v2_20_0.xsd
+++ b/v2_20_0/CDT-allJoynMethod-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_19_0.xsd" />
+ <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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_20_0/CDT-allJoynMethodCall-v2_20_0.xsd b/v2_20_0/CDT-allJoynMethodCall-v2_20_0.xsd
index a9797c777144e665086c68296f26f413261ae83d..c6f9957848d020b0a4e7786549883748ea476822 100644
--- a/v2_20_0/CDT-allJoynMethodCall-v2_20_0.xsd
+++ b/v2_20_0/CDT-allJoynMethodCall-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-allJoynProperty-v2_20_0.xsd b/v2_20_0/CDT-allJoynProperty-v2_20_0.xsd
index cb066ab0dc48095fe7bef30455c2e1cf65d2bd23..4eff8b4b9a6d2be42f17a7ba5d282e18a3de6b94 100644
--- a/v2_20_0/CDT-allJoynProperty-v2_20_0.xsd
+++ b/v2_20_0/CDT-allJoynProperty-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-allJoynSvcObject-v2_20_0.xsd b/v2_20_0/CDT-allJoynSvcObject-v2_20_0.xsd
index a54da6b10c1c223d6712e5c96acc6bc49ee1e3e6..e4a40613056a80a505333b353db3aa3b9106fe1c 100644
--- a/v2_20_0/CDT-allJoynSvcObject-v2_20_0.xsd
+++ b/v2_20_0/CDT-allJoynSvcObject-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_19_0.xsd" />
+ <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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-areaNwkDeviceInfo-v2_20_0.xsd b/v2_20_0/CDT-areaNwkDeviceInfo-v2_20_0.xsd
index 5b7e6c2cbfd7ffb8193c4c35ac0277c27782ab7c..9522c225e0f143f8bcdc5edb316cdfe3093d7cc9 100644
--- a/v2_20_0/CDT-areaNwkDeviceInfo-v2_20_0.xsd
+++ b/v2_20_0/CDT-areaNwkDeviceInfo-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-areaNwkInfo-v2_20_0.xsd b/v2_20_0/CDT-areaNwkInfo-v2_20_0.xsd
index a6bb6f36c811913b68109e2b93ad9a1a2d57b956..96921554b6f2bb530b9fce2689237c6e4c9a99c0 100644
--- a/v2_20_0/CDT-areaNwkInfo-v2_20_0.xsd
+++ b/v2_20_0/CDT-areaNwkInfo-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-battery-v2_20_0.xsd b/v2_20_0/CDT-battery-v2_20_0.xsd
index 79360f29c808d39e574c88b7a384593b3a9e4dbc..9cad9b87ef38b49c7132647daec5dd19640c2111 100644
--- a/v2_20_0/CDT-battery-v2_20_0.xsd
+++ b/v2_20_0/CDT-battery-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhBuffer-v2_20_0.xsd b/v2_20_0/CDT-cmdhBuffer-v2_20_0.xsd
index 3245ed63d3807b64d4cac3721f35bbea9d5ce362..3148be00e38dddaa05070c4c9fb1eb80d5b85608 100644
--- a/v2_20_0/CDT-cmdhBuffer-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhBuffer-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhDefEcValue-v2_20_0.xsd b/v2_20_0/CDT-cmdhDefEcValue-v2_20_0.xsd
index 609f0c2c48812c25953dc901ceaa7f6e3899b5fe..af4031dafd9d99745e1d382d05e1027424bfc388 100644
--- a/v2_20_0/CDT-cmdhDefEcValue-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhDefEcValue-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhDefaults-v2_20_0.xsd b/v2_20_0/CDT-cmdhDefaults-v2_20_0.xsd
index 6c1c5adca677b01a67aca2817a1df03aaefce124..5d0b62fa9c6cb12779baeecd00672dd7e1e3759d 100644
--- a/v2_20_0/CDT-cmdhDefaults-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhDefaults-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhEcDefParamValues-v2_20_0.xsd b/v2_20_0/CDT-cmdhEcDefParamValues-v2_20_0.xsd
index 88e80210f697b4dfe3838dd011c286eff463cd07..43246dbc8b19067007056e409d776f0d778a54fb 100644
--- a/v2_20_0/CDT-cmdhEcDefParamValues-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhEcDefParamValues-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhLimits-v2_20_0.xsd b/v2_20_0/CDT-cmdhLimits-v2_20_0.xsd
index f4a203a4851489c9eccf15be156d395e5b807a50..44a76aa5284b73afb0b80b50d200a4140026406c 100644
--- a/v2_20_0/CDT-cmdhLimits-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhLimits-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhNetworkAccessRules-v2_20_0.xsd b/v2_20_0/CDT-cmdhNetworkAccessRules-v2_20_0.xsd
index af32dce82dba8260135c1ce51f024cc2b60444a1..4ce76950074e2ee9902c4572430549b31bf409bc 100644
--- a/v2_20_0/CDT-cmdhNetworkAccessRules-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhNetworkAccessRules-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhNwAccessRule-v2_20_0.xsd b/v2_20_0/CDT-cmdhNwAccessRule-v2_20_0.xsd
index 7dc719ac49aa2d2feb57ec0c2f351749e289f378..7fbeaf8beefb6456ff7c431b70c371dd97b8ca91 100644
--- a/v2_20_0/CDT-cmdhNwAccessRule-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhNwAccessRule-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-cmdhPolicy-v2_20_0.xsd b/v2_20_0/CDT-cmdhPolicy-v2_20_0.xsd
index 96009a6f18badc93f20d8995b3ed3395184e26ca..c80ef3ca2df95e4ff4257bcfe42800340591ef93 100644
--- a/v2_20_0/CDT-cmdhPolicy-v2_20_0.xsd
+++ b/v2_20_0/CDT-cmdhPolicy-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-commonTypes-v2_20_0.xsd b/v2_20_0/CDT-commonTypes-v2_20_0.xsd
index 0dbefd0f17575b7d8b7fb2d5ff3461dc56bb1fed..9cac368b1ded0d2f0d0680cff6c60b483b0e6285 100644
--- a/v2_20_0/CDT-commonTypes-v2_20_0.xsd
+++ b/v2_20_0/CDT-commonTypes-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_20_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_20_0/CDT-container-v2_20_0.xsd b/v2_20_0/CDT-container-v2_20_0.xsd
index f721502d6a95953edb13aa0d3ba9013f1a791362..990b5f44396d3c3adde6f1cf8852766ae6cc509f 100644
--- a/v2_20_0/CDT-container-v2_20_0.xsd
+++ b/v2_20_0/CDT-container-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+ <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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_20_0/CDT-contentInstance-v2_20_0.xsd b/v2_20_0/CDT-contentInstance-v2_20_0.xsd
index 0051ea032d1822eddd641ab63a578d8a43ab3794..9921ebc27b9f767e7b274720895cd93aee24ea6f 100644
--- a/v2_20_0/CDT-contentInstance-v2_20_0.xsd
+++ b/v2_20_0/CDT-contentInstance-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-delivery-v2_20_0.xsd b/v2_20_0/CDT-delivery-v2_20_0.xsd
index 0d8f9a96b584f4f3e6d818bd1d431027a3d76989..d1cc8c761e9215eda8d3a237e3c51176255ae09f 100644
--- a/v2_20_0/CDT-delivery-v2_20_0.xsd
+++ b/v2_20_0/CDT-delivery-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_20_0/CDT-deviceCapability-v2_20_0.xsd b/v2_20_0/CDT-deviceCapability-v2_20_0.xsd
index 85af7d8481773a4e887b8386fe362e30d036026c..2dbe368bb73c040e7b81a485f23f9afc2d775d96 100644
--- a/v2_20_0/CDT-deviceCapability-v2_20_0.xsd
+++ b/v2_20_0/CDT-deviceCapability-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-deviceInfo-v2_20_0.xsd b/v2_20_0/CDT-deviceInfo-v2_20_0.xsd
index a959551390eaa1415aa1d9ae068b0bc0776cefed..070f2a638473722b28c40fc05f7eee481ea68060 100644
--- a/v2_20_0/CDT-deviceInfo-v2_20_0.xsd
+++ b/v2_20_0/CDT-deviceInfo-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-dynamicAuthorizationConsultation-v2_20_0.xsd b/v2_20_0/CDT-dynamicAuthorizationConsultation-v2_20_0.xsd
index fb8f278c21bb82d47fad51e01a662c7459c49334..d8cc1bbc7ba275b0bab1c0ef67ab4d3da77403d8 100644
--- a/v2_20_0/CDT-dynamicAuthorizationConsultation-v2_20_0.xsd
+++ b/v2_20_0/CDT-dynamicAuthorizationConsultation-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-eventConfig-v2_20_0.xsd b/v2_20_0/CDT-eventConfig-v2_20_0.xsd
index 0f6c586744494fe8c374ad8b0c785aa52238713f..5a8f2e61593c18512926a49b98905a93b22b5070 100644
--- a/v2_20_0/CDT-eventConfig-v2_20_0.xsd
+++ b/v2_20_0/CDT-eventConfig-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-eventLog-v2_20_0.xsd b/v2_20_0/CDT-eventLog-v2_20_0.xsd
index 7488a41361fc5ebfa652db6e83c987dd5a61138a..86b65936fa5e401018d4a40e4426fef0af9874dd 100644
--- a/v2_20_0/CDT-eventLog-v2_20_0.xsd
+++ b/v2_20_0/CDT-eventLog-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-execInstance-v2_20_0.xsd b/v2_20_0/CDT-execInstance-v2_20_0.xsd
index 81807e24d6d58e15a976f7f1882e6d5cef1eebf4..6b2acfdf288d7004e0d2552387cc08205e6a995d 100644
--- a/v2_20_0/CDT-execInstance-v2_20_0.xsd
+++ b/v2_20_0/CDT-execInstance-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-firmware-v2_20_0.xsd b/v2_20_0/CDT-firmware-v2_20_0.xsd
index 8e613dc07b853cfdefbe64c2f59c1aad80306856..3178930a4fd750d2ac0009e41826db17de08189d 100644
--- a/v2_20_0/CDT-firmware-v2_20_0.xsd
+++ b/v2_20_0/CDT-firmware-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-genericInterworkingOperationInstance-v2_20_0.xsd b/v2_20_0/CDT-genericInterworkingOperationInstance-v2_20_0.xsd
index 3f1588be262f774f4206c7d5753d5c05bba49d84..f651391d9ed71b872b503973c8cc9a467a1d6c83 100644
--- a/v2_20_0/CDT-genericInterworkingOperationInstance-v2_20_0.xsd
+++ b/v2_20_0/CDT-genericInterworkingOperationInstance-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-genericInterworkingService-v2_20_0.xsd b/v2_20_0/CDT-genericInterworkingService-v2_20_0.xsd
index 8e263afb9a0f77c355f1d13a5d626b5c6f402336..ccef5671de4bbc459a1771505d28be4202ccbca1 100644
--- a/v2_20_0/CDT-genericInterworkingService-v2_20_0.xsd
+++ b/v2_20_0/CDT-genericInterworkingService-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_19_0.xsd" />
+ <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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-group-v2_20_0.xsd b/v2_20_0/CDT-group-v2_20_0.xsd
index dc77dce2304c371f738f8793901b4a952740923b..0aed183fd4a3b03dfe468e7cee7a7758489936f3 100644
--- a/v2_20_0/CDT-group-v2_20_0.xsd
+++ b/v2_20_0/CDT-group-v2_20_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_19_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd"/>
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd"/>
+ <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:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-locationPolicy-v2_20_0.xsd b/v2_20_0/CDT-locationPolicy-v2_20_0.xsd
index ea26df19b4e536232b4238f6c91c5931c90d8972..2221b7795665bcc1650b4e242d47b35c846dd5a0 100644
--- a/v2_20_0/CDT-locationPolicy-v2_20_0.xsd
+++ b/v2_20_0/CDT-locationPolicy-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd b/v2_20_0/CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd
index b2af2d0095f996f329f7937b8be7440c25202000..ef85b32ba605e3272b4f3a616ef538dabfb8ac90 100644
--- a/v2_20_0/CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd
+++ b/v2_20_0/CDT-m2mServiceSubscriptionProfile-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_19_0.xsd" />
+ <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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-memory-v2_20_0.xsd b/v2_20_0/CDT-memory-v2_20_0.xsd
index 92586087c024a014631e5e812559c009fc8c2714..b0fbd3b4fb63da5ae3f4d44f86492a0abb1b0f21 100644
--- a/v2_20_0/CDT-memory-v2_20_0.xsd
+++ b/v2_20_0/CDT-memory-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-mgmtCmd-v2_20_0.xsd b/v2_20_0/CDT-mgmtCmd-v2_20_0.xsd
index d33283f1ff13823e92479665b02b0555a316cd45..53869eebcb1507886ac613ae6a0c6a5f26e9a9eb 100644
--- a/v2_20_0/CDT-mgmtCmd-v2_20_0.xsd
+++ b/v2_20_0/CDT-mgmtCmd-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_19_0.xsd" />
+ <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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-node-v2_20_0.xsd b/v2_20_0/CDT-node-v2_20_0.xsd
index 8e20303be0a14b99bf4dcb72eb18bc5ff59cfb39..920547b96fb104b715545ab21fbd25b7daf5fb7f 100644
--- a/v2_20_0/CDT-node-v2_20_0.xsd
+++ b/v2_20_0/CDT-node-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_19_0.xsd" />
+ <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:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-notification-v2_20_0.xsd b/v2_20_0/CDT-notification-v2_20_0.xsd
index 19720c5aecf933b15897b935c594b7d2070fd869..6f2c4fb11833812dbcd8599ae2380df6bfb02138 100644
--- a/v2_20_0/CDT-notification-v2_20_0.xsd
+++ b/v2_20_0/CDT-notification-v2_20_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_19_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_19_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_20_0/CDT-notificationTargetMgmtPolicyRef-v2_20_0.xsd b/v2_20_0/CDT-notificationTargetMgmtPolicyRef-v2_20_0.xsd
index d2c39c9eec8c8cea9d59ca83d16abe852dd02e1b..b4680448e626f9dfb643d54e1a68775a43271b7a 100644
--- a/v2_20_0/CDT-notificationTargetMgmtPolicyRef-v2_20_0.xsd
+++ b/v2_20_0/CDT-notificationTargetMgmtPolicyRef-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-notificationTargetPolicy-v2_20_0.xsd b/v2_20_0/CDT-notificationTargetPolicy-v2_20_0.xsd
index 81e961327afc23a5dd4dd1c43208d7604a5579da..ce758e76991b18b173f9c76a1ab71b68a4560fe0 100644
--- a/v2_20_0/CDT-notificationTargetPolicy-v2_20_0.xsd
+++ b/v2_20_0/CDT-notificationTargetPolicy-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-policyDeletionRules-v2_20_0.xsd b/v2_20_0/CDT-policyDeletionRules-v2_20_0.xsd
index fe45e31e786117e3d59787ff454d97f272afaf08..c44ee0e2ff1739a907e579f0ef73d33758154d1a 100644
--- a/v2_20_0/CDT-policyDeletionRules-v2_20_0.xsd
+++ b/v2_20_0/CDT-policyDeletionRules-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-pollingChannel-v2_20_0.xsd b/v2_20_0/CDT-pollingChannel-v2_20_0.xsd
index 7ae4ce363e8c1ea002d4cdea1060b663e78c8bd4..5a5503e808f1857d93efa1269945d589cc3cd3ae 100644
--- a/v2_20_0/CDT-pollingChannel-v2_20_0.xsd
+++ b/v2_20_0/CDT-pollingChannel-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-reboot-v2_20_0.xsd b/v2_20_0/CDT-reboot-v2_20_0.xsd
index 763d89b025f2c5f900dba2fc1076d4b3b20b8a9e..a17bc20b8cccbed380054b516d8f4e5f1faf175e 100644
--- a/v2_20_0/CDT-reboot-v2_20_0.xsd
+++ b/v2_20_0/CDT-reboot-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-remoteCSE-v2_20_0.xsd b/v2_20_0/CDT-remoteCSE-v2_20_0.xsd
index d9991265e2337ef0430b5801465a2bd202921bc0..35fe39a3c234b52e160768ef8198dc5842913fb9 100644
--- a/v2_20_0/CDT-remoteCSE-v2_20_0.xsd
+++ b/v2_20_0/CDT-remoteCSE-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_19_0.xsd" />
+ <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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-request-v2_20_0.xsd b/v2_20_0/CDT-request-v2_20_0.xsd
index ce2cfe4697e88134b590953b2980a7202b21401d..ea27618b2aabc16e2159280316a0ef8aa616e723 100644
--- a/v2_20_0/CDT-request-v2_20_0.xsd
+++ b/v2_20_0/CDT-request-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd b/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd
index 34a805762b60fde67383ffeccd809a85d9ced1e0..83142608541ac3ecdb5e2ecc12256b5f2b97aab8 100644
--- a/v2_20_0/CDT-requestPrimitive-v2_20_0.xsd
+++ b/v2_20_0/CDT-requestPrimitive-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_20_0/CDT-responsePrimitive-v2_20_0.xsd b/v2_20_0/CDT-responsePrimitive-v2_20_0.xsd
index 778ce5e5b4bfabd392a0a8e855b06656bee3725d..4b27d5d4751835de3c0f0b45b3e83de4ed7080a6 100644
--- a/v2_20_0/CDT-responsePrimitive-v2_20_0.xsd
+++ b/v2_20_0/CDT-responsePrimitive-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_19_0.xsd" />
+ <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:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_20_0/CDT-role-v2_20_0.xsd b/v2_20_0/CDT-role-v2_20_0.xsd
index c0ef6ebda7b2314cdf0d7988a7a6953863de8e5f..157b76f035ed058bc3f1d4d2eec8c008dce5cee2 100644
--- a/v2_20_0/CDT-role-v2_20_0.xsd
+++ b/v2_20_0/CDT-role-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-schedule-v2_20_0.xsd b/v2_20_0/CDT-schedule-v2_20_0.xsd
index 75ec6f9abdd98d76ee600fd7cedcf5a4b389bba9..08e1a2d3da082aa8578c26b65f308924baad2b8e 100644
--- a/v2_20_0/CDT-schedule-v2_20_0.xsd
+++ b/v2_20_0/CDT-schedule-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-semanticDescriptor-v2_20_0.xsd b/v2_20_0/CDT-semanticDescriptor-v2_20_0.xsd
index c12dd000a100ef666e8a977c146172db841686ba..06a7c920bee77e78de63b6b24a6fac0f634093ab 100644
--- a/v2_20_0/CDT-semanticDescriptor-v2_20_0.xsd
+++ b/v2_20_0/CDT-semanticDescriptor-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-serviceSubscribedAppRule-v2_20_0.xsd b/v2_20_0/CDT-serviceSubscribedAppRule-v2_20_0.xsd
index e4d86e77d3b7dc674c24e5b0be8cdea5541bc3f5..2c71abe70661a55fc0b5109d8391c694d9f23249 100644
--- a/v2_20_0/CDT-serviceSubscribedAppRule-v2_20_0.xsd
+++ b/v2_20_0/CDT-serviceSubscribedAppRule-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-serviceSubscribedNode-v2_20_0.xsd b/v2_20_0/CDT-serviceSubscribedNode-v2_20_0.xsd
index 1cd3211fce86515e2fd8f91192202fee9a7cf08f..b05cdc1aa75b208492888c37c1654df804a81a51 100644
--- a/v2_20_0/CDT-serviceSubscribedNode-v2_20_0.xsd
+++ b/v2_20_0/CDT-serviceSubscribedNode-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-software-v2_20_0.xsd b/v2_20_0/CDT-software-v2_20_0.xsd
index 4d507b0f0f201cabda706e475ff3e39fea499c86..13385497434f40906e7b9e5cb7f9174ff60d46d1 100644
--- a/v2_20_0/CDT-software-v2_20_0.xsd
+++ b/v2_20_0/CDT-software-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-statsCollect-v2_20_0.xsd b/v2_20_0/CDT-statsCollect-v2_20_0.xsd
index e65d9db5fdee10ddfde1c4f12f92229a9419ef3f..d36b35ca3b80ccae72102d421f999a71f9972fbf 100644
--- a/v2_20_0/CDT-statsCollect-v2_20_0.xsd
+++ b/v2_20_0/CDT-statsCollect-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-statsConfig-v2_20_0.xsd b/v2_20_0/CDT-statsConfig-v2_20_0.xsd
index 74138a420f79431fbc5560181bf4c0a6dbc0c314..8f62d2d56e5bcb922ab62d164f685095d8cceb3c 100644
--- a/v2_20_0/CDT-statsConfig-v2_20_0.xsd
+++ b/v2_20_0/CDT-statsConfig-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-subscription-v2_20_0.xsd b/v2_20_0/CDT-subscription-v2_20_0.xsd
index 49d08d74467229462fb15fd547ccfca1f6bbfb17..55439ea0f481c0402bf7bd3dc50851fc99ca6a43 100644
--- a/v2_20_0/CDT-subscription-v2_20_0.xsd
+++ b/v2_20_0/CDT-subscription-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_19_0.xsd" />
+ <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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-svcFwWrapper-v2_20_0.xsd b/v2_20_0/CDT-svcFwWrapper-v2_20_0.xsd
index 0fafd74320fd9405ab78932fdde8587019d50fd0..22608ad1611281f3cd6b0e4afe0aaa4bbc1be58d 100644
--- a/v2_20_0/CDT-svcFwWrapper-v2_20_0.xsd
+++ b/v2_20_0/CDT-svcFwWrapper-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
+ <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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-svcObjWrapper-v2_20_0.xsd b/v2_20_0/CDT-svcObjWrapper-v2_20_0.xsd
index ed7fe538f43add5587e45ed11f338feedab144b2..a6b1c918ec4ad9ba6c68a0451e1e2e698651952d 100644
--- a/v2_20_0/CDT-svcObjWrapper-v2_20_0.xsd
+++ b/v2_20_0/CDT-svcObjWrapper-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_19_0.xsd" />
+ <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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-timeSeries-v2_20_0.xsd b/v2_20_0/CDT-timeSeries-v2_20_0.xsd
index ad92849347c8a75bf3033361793315ad009dcd98..ce15cbf97c3a5d6be2f7e78eb40b03fad2d09025 100644
--- a/v2_20_0/CDT-timeSeries-v2_20_0.xsd
+++ b/v2_20_0/CDT-timeSeries-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_19_0.xsd" />
+ <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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_20_0/CDT-timeSeriesInstance-v2_20_0.xsd b/v2_20_0/CDT-timeSeriesInstance-v2_20_0.xsd
index d1111be98ed77218ec72d66d5ad212f621cff49e..abcda11690c73d9c76925345fbd70ddca448c353 100644
--- a/v2_20_0/CDT-timeSeriesInstance-v2_20_0.xsd
+++ b/v2_20_0/CDT-timeSeriesInstance-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-token-v2_20_0.xsd b/v2_20_0/CDT-token-v2_20_0.xsd
index 944b29197920a67128d4c88f98edb319d045256e..4839c67687eb658d7d0b5b0830830c135502e0e7 100644
--- a/v2_20_0/CDT-token-v2_20_0.xsd
+++ b/v2_20_0/CDT-token-v2_20_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_19_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_20_0/CDT-trafficPattern-v2_20_0.xsd b/v2_20_0/CDT-trafficPattern-v2_20_0.xsd
index 26febaf77588f2eb80d8bcf753e4d7df63c36d08..e921e01c1fc96595465d6cceb9d15d3ded0b6b6e 100644
--- a/v2_20_0/CDT-trafficPattern-v2_20_0.xsd
+++ b/v2_20_0/CDT-trafficPattern-v2_20_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_19_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_19_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_19_0.xsd" />
+ <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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>