diff --git a/v2_31_0/CDT-AE-v2_31_0.xsd b/v2_31_0/CDT-AE-v2_31_0.xsd
index 4fa834a295f553cd6e9b949828a637d86e355409..d6d4596bda3d7ac52efbacbfb0682713c40b5ffc 100644
--- a/v2_31_0/CDT-AE-v2_31_0.xsd
+++ b/v2_31_0/CDT-AE-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_31_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-CSEBase-v2_31_0.xsd b/v2_31_0/CDT-CSEBase-v2_31_0.xsd
index 8166785ee64522d6e82cd05c52829076056c5f55..8011c10cdb895ebdf13aee8f3ebafcbde21038bd 100644
--- a/v2_31_0/CDT-CSEBase-v2_31_0.xsd
+++ b/v2_31_0/CDT-CSEBase-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_31_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd b/v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd
index 0cf5c8316e95c17f02fc0cf4a9bf1712958601a4..845e48cfb9a0e75e54390782bbba119be169a108 100644
--- a/v2_31_0/CDT-accessControlPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-accessControlPolicy-v2_31_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_30_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd b/v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd
index b8723819dd87f6c169f6f057bb7e4f4eebe8422b..89bae743455e358fd0a87cffbd9a986ed7eada05 100644
--- a/v2_31_0/CDT-activeCmdhPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-activeCmdhPolicy-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynApp-v2_31_0.xsd b/v2_31_0/CDT-allJoynApp-v2_31_0.xsd
index 45a2f626ad08da8c7adb81628bb7e7477baa95ec..a13a74fd61778ebc26acd36f83413a931ac49a87 100644
--- a/v2_31_0/CDT-allJoynApp-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynApp-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_31_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynInterface-v2_31_0.xsd b/v2_31_0/CDT-allJoynInterface-v2_31_0.xsd
index 6aa8f64e3355c30a221b44a5909088bb2fe8703d..d125d0c4caeeabcd8505f77900263757e0f6db80 100644
--- a/v2_31_0/CDT-allJoynInterface-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynInterface-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_31_0/CDT-allJoynMethod-v2_31_0.xsd b/v2_31_0/CDT-allJoynMethod-v2_31_0.xsd
index 0d50c39ce6d603ead6d19c8da107a4b4cac83ecc..68457e963de277265c42d1ecbff8d55460b1a54b 100644
--- a/v2_31_0/CDT-allJoynMethod-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynMethod-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_31_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd b/v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd
index a708c0e770f8c6efc9d8760c4fe09bb53d78a996..76926601f9a5f5c1ed82efea478c52039609e69c 100644
--- a/v2_31_0/CDT-allJoynMethodCall-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynMethodCall-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynProperty-v2_31_0.xsd b/v2_31_0/CDT-allJoynProperty-v2_31_0.xsd
index c55328686fead48c45efdd5bc0fa77f8094ef8a5..d3b25c31167e2d33c2114e93c3529702cf489e6d 100644
--- a/v2_31_0/CDT-allJoynProperty-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynProperty-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd b/v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd
index 0b003c06bdb786997b32929b51cdcea8b3039b0d..eb57c3ce1b01d0f2b06c0368f90f23d0f08044f3 100644
--- a/v2_31_0/CDT-allJoynSvcObject-v2_31_0.xsd
+++ b/v2_31_0/CDT-allJoynSvcObject-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_31_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd b/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd
index fc3193acb8563b0e70e96db221ebef9543d2a0c3..a29a39dfc86ee9d4f54cb1d803a1944571988ee4 100644
--- a/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_0.xsd
+++ b/v2_31_0/CDT-areaNwkDeviceInfo-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd b/v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd
index 130f07a8992b5b5d75c1ce8de13ffafcb28942b9..fd9e87314581a2b360c10f3382d3c832f2d29acf 100644
--- a/v2_31_0/CDT-areaNwkInfo-v2_31_0.xsd
+++ b/v2_31_0/CDT-areaNwkInfo-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-battery-v2_31_0.xsd b/v2_31_0/CDT-battery-v2_31_0.xsd
index 969eef8e1d0e0b7df0550d06d068584ac6db4e8d..de10b28479121e7657e97730acae93d333ffda11 100644
--- a/v2_31_0/CDT-battery-v2_31_0.xsd
+++ b/v2_31_0/CDT-battery-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd b/v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd
index f1b37ca4168e043813ddfc44d603ee4fbe02e719..1a21b5a2dee1638268444ff7866754463b740bfa 100644
--- a/v2_31_0/CDT-cmdhBuffer-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhBuffer-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd b/v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd
index 61d1f928c04deafb5059c5c15d8c559fdf776650..7cebe181a4cf71b2dc9290bba19eb5dc0f087d48 100644
--- a/v2_31_0/CDT-cmdhDefEcValue-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhDefEcValue-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd b/v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd
index a4d7dfd358ce8bd2f734d6f843ac8cb09317866f..ebe16d81333774bbfe5ad1e89b132414ff7330d2 100644
--- a/v2_31_0/CDT-cmdhDefaults-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhDefaults-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd b/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd
index 09e0df1eaa0a30312e0245bbec45bd5d90ee76fc..a8883fe43e88322538fafc8a986128cce202e4eb 100644
--- a/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhEcDefParamValues-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhLimits-v2_31_0.xsd b/v2_31_0/CDT-cmdhLimits-v2_31_0.xsd
index c9a7cb9f57ff560a00e3a3114a0dbc12c5e4e178..1added465e8f0870b7896861a7d18daa9e709dcb 100644
--- a/v2_31_0/CDT-cmdhLimits-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhLimits-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_0.xsd b/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_0.xsd
index 48e73886da1b310ac72642edeaad0bfc651ef555..a73659ee6cc34405165418f7f7ce4565346221a4 100644
--- a/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhNetworkAccessRules-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd b/v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd
index 793fe8072134225531633cb6237147918822ded7..9083ffeb13ab49f7780e7d3a926e0ca781afcb74 100644
--- a/v2_31_0/CDT-cmdhNwAccessRule-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhNwAccessRule-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd b/v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd
index 177f6c886d6255a1e70959ba757c06a3efca7592..826f3faa3470bfa70d52fc96075c7f0a70325a01 100644
--- a/v2_31_0/CDT-cmdhPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-cmdhPolicy-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-commonTypes-v2_31_0.xsd b/v2_31_0/CDT-commonTypes-v2_31_0.xsd
index 49196a1fdf9d59dbae2c2c9cbd8ca8fe90e8587b..da0704ca2509d2195a7b216933d11b407dbc7eeb 100644
--- a/v2_31_0/CDT-commonTypes-v2_31_0.xsd
+++ b/v2_31_0/CDT-commonTypes-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_31_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_31_0/CDT-container-v2_31_0.xsd b/v2_31_0/CDT-container-v2_31_0.xsd
index 78e35a4c71880d9786ac79f20ed7543319944c00..59d3d6607f7061ae6f1c3403f642906ee5668ac4 100644
--- a/v2_31_0/CDT-container-v2_31_0.xsd
+++ b/v2_31_0/CDT-container-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_31_0/CDT-contentInstance-v2_31_0.xsd b/v2_31_0/CDT-contentInstance-v2_31_0.xsd
index 89886869f9fd1c55a968dc056302e20d9dca61d2..43d554c0c7cc69d84acef65a4a46929e016958b8 100644
--- a/v2_31_0/CDT-contentInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-contentInstance-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-delivery-v2_31_0.xsd b/v2_31_0/CDT-delivery-v2_31_0.xsd
index 4af2241f17a6f91f1eddc57f951563641ab78dea..e7bc63f7ebae706627894f302080505f610cab2f 100644
--- a/v2_31_0/CDT-delivery-v2_31_0.xsd
+++ b/v2_31_0/CDT-delivery-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_31_0/CDT-deviceCapability-v2_31_0.xsd b/v2_31_0/CDT-deviceCapability-v2_31_0.xsd
index 9e79a5befe0efffe70ad6c9fb17dbd337d9d361a..61f5065fcc03789845b00e2588f44d1016261c7b 100644
--- a/v2_31_0/CDT-deviceCapability-v2_31_0.xsd
+++ b/v2_31_0/CDT-deviceCapability-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-deviceInfo-v2_31_0.xsd b/v2_31_0/CDT-deviceInfo-v2_31_0.xsd
index e960a27cb290b386389cd93ab66fb801853ea3c8..700ba2d2b9cdc66b9a0d208e8e51915667d5140c 100644
--- a/v2_31_0/CDT-deviceInfo-v2_31_0.xsd
+++ b/v2_31_0/CDT-deviceInfo-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd b/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd
index 71ec0cc199d2e1f4d655a9770f8509e166b4ea75..59561877f458149c373638c4fa033f30c94da6f7 100644
--- a/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_0.xsd
+++ b/v2_31_0/CDT-dynamicAuthorizationConsultation-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-eventConfig-v2_31_0.xsd b/v2_31_0/CDT-eventConfig-v2_31_0.xsd
index 546d5ae3b5c419fda5de6ef2ca1f20b46bab0155..996956823cc50ce982f04cb00e27e47dadb3d975 100644
--- a/v2_31_0/CDT-eventConfig-v2_31_0.xsd
+++ b/v2_31_0/CDT-eventConfig-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-eventLog-v2_31_0.xsd b/v2_31_0/CDT-eventLog-v2_31_0.xsd
index f940a3927c161c5e10df2b98ea15d06cf7c5b468..91275cdcc7d23bd0942fba7469a603e6efd9d4ab 100644
--- a/v2_31_0/CDT-eventLog-v2_31_0.xsd
+++ b/v2_31_0/CDT-eventLog-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-execInstance-v2_31_0.xsd b/v2_31_0/CDT-execInstance-v2_31_0.xsd
index 9a08f5dc02f2f91e813eacc64d50b98da98d6e61..cef77e57b7dbe4b43a1bfd0e04058afb2c62b257 100644
--- a/v2_31_0/CDT-execInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-execInstance-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-firmware-v2_31_0.xsd b/v2_31_0/CDT-firmware-v2_31_0.xsd
index 9386867175c5fe01fb806e14fbd9da3df30569da..79c7ffc778de30d22a6bcb1a94f82e04fc882040 100644
--- a/v2_31_0/CDT-firmware-v2_31_0.xsd
+++ b/v2_31_0/CDT-firmware-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_0.xsd b/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_0.xsd
index fded4791012a2f925dfca60035b55356873607e0..54e284fc89705cb65091f221ec0f585db6f00e3f 100644
--- a/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-genericInterworkingOperationInstance-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-genericInterworkingService-v2_31_0.xsd b/v2_31_0/CDT-genericInterworkingService-v2_31_0.xsd
index 08898b21e36166322024347908134728b0038a59..12bb139ed9d4ee8ecdb6d8793ff9c87943d56cf2 100644
--- a/v2_31_0/CDT-genericInterworkingService-v2_31_0.xsd
+++ b/v2_31_0/CDT-genericInterworkingService-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_31_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-group-v2_31_0.xsd b/v2_31_0/CDT-group-v2_31_0.xsd
index 1d8eb084f56336d3c8a9e57d7132e21de9b26867..75716e1dbe620524fe23b75b1909b324e9106c6d 100644
--- a/v2_31_0/CDT-group-v2_31_0.xsd
+++ b/v2_31_0/CDT-group-v2_31_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_30_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd"/>
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-locationPolicy-v2_31_0.xsd b/v2_31_0/CDT-locationPolicy-v2_31_0.xsd
index eca47cc885ae4fd3e97a419776b01697d5ee6ed3..4e5ec06154ef73aa0826c95b451fa11459193f75 100644
--- a/v2_31_0/CDT-locationPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-locationPolicy-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd b/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd
index 18f11831cd4da96582209ab9a2fe8caddc683b2c..26e6afefefc3d529027e0b5686b02d096211423f 100644
--- a/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd
+++ b/v2_31_0/CDT-m2mServiceSubscriptionProfile-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_31_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-memory-v2_31_0.xsd b/v2_31_0/CDT-memory-v2_31_0.xsd
index 1d2df42b14ed87a76902c7790ba20c01c33536d2..e4577ea84bcb528448a760eaac5991771314a3c2 100644
--- a/v2_31_0/CDT-memory-v2_31_0.xsd
+++ b/v2_31_0/CDT-memory-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-mgmtCmd-v2_31_0.xsd b/v2_31_0/CDT-mgmtCmd-v2_31_0.xsd
index 9096a55749ccba79fbe5e371c7cd5905ff84907b..797d32c01d8c22f229f3b13eb6d703ffb65f23e3 100644
--- a/v2_31_0/CDT-mgmtCmd-v2_31_0.xsd
+++ b/v2_31_0/CDT-mgmtCmd-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_31_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-node-v2_31_0.xsd b/v2_31_0/CDT-node-v2_31_0.xsd
index 3809b16302ba25f02f3f6d3fd8690ae7f79ea988..9a4244923f54659ee1d0701c29ba0416837efa03 100644
--- a/v2_31_0/CDT-node-v2_31_0.xsd
+++ b/v2_31_0/CDT-node-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_31_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-notification-v2_31_0.xsd b/v2_31_0/CDT-notification-v2_31_0.xsd
index 442ec9ba712d8a3bd8b82686800b0557066153e5..fe04ffe5efc59bdf3440c0376354ec2c57546fd5 100644
--- a/v2_31_0/CDT-notification-v2_31_0.xsd
+++ b/v2_31_0/CDT-notification-v2_31_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_30_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_30_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_31_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd b/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd
index 8f42f0d5764329f3d9c57e51861f5f03bf0d5279..6d96fa3bd391f93192736aba0e6341f5bcd09f62 100644
--- a/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd
+++ b/v2_31_0/CDT-notificationTargetMgmtPolicyRef-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-notificationTargetPolicy-v2_31_0.xsd b/v2_31_0/CDT-notificationTargetPolicy-v2_31_0.xsd
index f07741da2f9e59d3ce7545729050f6fedc8164c6..fe9b99a29cc59af86589a36c002ad9fa95f3534a 100644
--- a/v2_31_0/CDT-notificationTargetPolicy-v2_31_0.xsd
+++ b/v2_31_0/CDT-notificationTargetPolicy-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd b/v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd
index a8821c411936958f8feda3299bad6eb4bd95775c..96e7e02d340b910eb13b9241d6b1f9675df0e24f 100644
--- a/v2_31_0/CDT-policyDeletionRules-v2_31_0.xsd
+++ b/v2_31_0/CDT-policyDeletionRules-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-pollingChannel-v2_31_0.xsd b/v2_31_0/CDT-pollingChannel-v2_31_0.xsd
index 6b95fc04463def5243df1562d0fb3ba7b7d70e8c..31b86be56be29b1daa38d503351c4fe2db4c01c0 100644
--- a/v2_31_0/CDT-pollingChannel-v2_31_0.xsd
+++ b/v2_31_0/CDT-pollingChannel-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-reboot-v2_31_0.xsd b/v2_31_0/CDT-reboot-v2_31_0.xsd
index 0756c96b3622c04e76d33dfc7d49e0fb5ec8059a..514e7af86869f0ca00db89e8cdee0c44f4ef72e5 100644
--- a/v2_31_0/CDT-reboot-v2_31_0.xsd
+++ b/v2_31_0/CDT-reboot-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-remoteCSE-v2_31_0.xsd b/v2_31_0/CDT-remoteCSE-v2_31_0.xsd
index 77f429bf13fe8490373d6fecea351487eaa3393f..5ef4f00a6cc7f1e30d77f7842f5b91eca0fe42a8 100644
--- a/v2_31_0/CDT-remoteCSE-v2_31_0.xsd
+++ b/v2_31_0/CDT-remoteCSE-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_31_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-request-v2_31_0.xsd b/v2_31_0/CDT-request-v2_31_0.xsd
index ef38fd7c2d688f060b7c11047bbf2ee72260900f..47cf53bebc7e26f015c58743848defd5b4f28894 100644
--- a/v2_31_0/CDT-request-v2_31_0.xsd
+++ b/v2_31_0/CDT-request-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-requestPrimitive-v2_31_0.xsd b/v2_31_0/CDT-requestPrimitive-v2_31_0.xsd
index a6db7054e63f4dd3e85569f125236ada02c8b5d3..659af07285e7cb5c6e10a136379f121ac106001c 100644
--- a/v2_31_0/CDT-requestPrimitive-v2_31_0.xsd
+++ b/v2_31_0/CDT-requestPrimitive-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd b/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd
index 635a1abb6ce796e34550df55731521416793c451..e5fc64e9b800a7d3df215ea2161a5c53d98f2208 100644
--- a/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd
+++ b/v2_31_0/CDT-responsePrimitive-v2_31_0.xsd
@@ -28,54 +28,54 @@ 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_30_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_31_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_31_0/CDT-role-v2_31_0.xsd b/v2_31_0/CDT-role-v2_31_0.xsd
index 036222708940204716e0e59ba10807d70a8e1bbf..715a12dac1b9299726f2a05fd70fac10d2a89c2e 100644
--- a/v2_31_0/CDT-role-v2_31_0.xsd
+++ b/v2_31_0/CDT-role-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-schedule-v2_31_0.xsd b/v2_31_0/CDT-schedule-v2_31_0.xsd
index f65ba3303adf5c82101a5b0e1c1575958bc670b7..f2a888e845133723eab2a4f91672d7e3afd90c6e 100644
--- a/v2_31_0/CDT-schedule-v2_31_0.xsd
+++ b/v2_31_0/CDT-schedule-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd b/v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd
index f2586b9c436ab51e5e0c34b1d8759bf0519e5796..73064fb6b00d847d17336eaf9505939a3ce2d87a 100644
--- a/v2_31_0/CDT-semanticDescriptor-v2_31_0.xsd
+++ b/v2_31_0/CDT-semanticDescriptor-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_0.xsd b/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_0.xsd
index a6c715f2bdaefc5aae7c07a0cfeba060b8a1692b..f8cc1bffd445b466bbc964c279a7f88b40c4b7a7 100644
--- a/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_0.xsd
+++ b/v2_31_0/CDT-serviceSubscribedAppRule-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd b/v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd
index fde53bddf3ef49aa65c792966981f6b353f9d939..2e81786f58b9e45f43027eb09d09a8c21d3e8c27 100644
--- a/v2_31_0/CDT-serviceSubscribedNode-v2_31_0.xsd
+++ b/v2_31_0/CDT-serviceSubscribedNode-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-software-v2_31_0.xsd b/v2_31_0/CDT-software-v2_31_0.xsd
index 3b3be66357a312edf87c50bd3fe1088f7acff26d..faca06d0d617f7f4a32ee2165c32e58c72b88167 100644
--- a/v2_31_0/CDT-software-v2_31_0.xsd
+++ b/v2_31_0/CDT-software-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-statsCollect-v2_31_0.xsd b/v2_31_0/CDT-statsCollect-v2_31_0.xsd
index c2e33193c8cb009f5a712b314898e6d71d5f7eed..cc71af31bd7957318d608f0cef4d9349d3b4161e 100644
--- a/v2_31_0/CDT-statsCollect-v2_31_0.xsd
+++ b/v2_31_0/CDT-statsCollect-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-statsConfig-v2_31_0.xsd b/v2_31_0/CDT-statsConfig-v2_31_0.xsd
index 2e22aaa45c74e262e7c0ccbc810d009e6c7fff4d..55e83fbce6b7c40d1606906f6c2a4b3f6f72124e 100644
--- a/v2_31_0/CDT-statsConfig-v2_31_0.xsd
+++ b/v2_31_0/CDT-statsConfig-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-subscription-v2_31_0.xsd b/v2_31_0/CDT-subscription-v2_31_0.xsd
index a478fb8acd1e8cdc1fe3237b195ace905dbb43f0..8664125aca1c42299db99879c8bce63467286955 100644
--- a/v2_31_0/CDT-subscription-v2_31_0.xsd
+++ b/v2_31_0/CDT-subscription-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_31_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd b/v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd
index 1f0fd10d095c0c4bae62c129919f22aeb1f73bbb..916cf550f1b35fbe8c6c3a04ca6092f2a4ca850b 100644
--- a/v2_31_0/CDT-svcFwWrapper-v2_31_0.xsd
+++ b/v2_31_0/CDT-svcFwWrapper-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd b/v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd
index a4a5c6eb004a71bf72a9672da71d651777131dc3..589f37d0c8013d3d1f010e595ffc9d7b69f2d94d 100644
--- a/v2_31_0/CDT-svcObjWrapper-v2_31_0.xsd
+++ b/v2_31_0/CDT-svcObjWrapper-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_31_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-timeSeries-v2_31_0.xsd b/v2_31_0/CDT-timeSeries-v2_31_0.xsd
index 0b7c118aa44abfa7a8bcc8973a71148506106e61..c3c1c2ee84c73ab0ec1d1089f7b48415fd3ad5ef 100644
--- a/v2_31_0/CDT-timeSeries-v2_31_0.xsd
+++ b/v2_31_0/CDT-timeSeries-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_31_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd b/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd
index 35635c70d365bc0b1f026bba1dc0d524e4144938..05bd5767b26d36f95e8bf3e70d9ca5ef75fbf157 100644
--- a/v2_31_0/CDT-timeSeriesInstance-v2_31_0.xsd
+++ b/v2_31_0/CDT-timeSeriesInstance-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-token-v2_31_0.xsd b/v2_31_0/CDT-token-v2_31_0.xsd
index e262f065c37cded4cf23e588dcd6f5eab76eb5f7..f248cf47c02eb70727baa330d38e6e3377f1508d 100644
--- a/v2_31_0/CDT-token-v2_31_0.xsd
+++ b/v2_31_0/CDT-token-v2_31_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_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_31_0/CDT-trafficPattern-v2_31_0.xsd b/v2_31_0/CDT-trafficPattern-v2_31_0.xsd
index 553f112397b2ae971b4c2f07b6f4588c62bb5325..f1ea72be7e16a2eae49815848c93740b0f305cd5 100644
--- a/v2_31_0/CDT-trafficPattern-v2_31_0.xsd
+++ b/v2_31_0/CDT-trafficPattern-v2_31_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_30_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_31_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_31_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>