diff --git a/v2_30_0/CDT-AE-v2_30_0.xsd b/v2_30_0/CDT-AE-v2_30_0.xsd
index 9ed6cf0f29469bc9006fb86415ac8baf5541a794..4fa834a295f553cd6e9b949828a637d86e355409 100644
--- a/v2_30_0/CDT-AE-v2_30_0.xsd
+++ b/v2_30_0/CDT-AE-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_29_0.xsd" />
+ <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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-CSEBase-v2_30_0.xsd b/v2_30_0/CDT-CSEBase-v2_30_0.xsd
index 69e0f90143416a86420f6ffc471a18883cf99615..8166785ee64522d6e82cd05c52829076056c5f55 100644
--- a/v2_30_0/CDT-CSEBase-v2_30_0.xsd
+++ b/v2_30_0/CDT-CSEBase-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_29_0.xsd" />
+ <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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_30_0/CDT-accessControlPolicy-v2_30_0.xsd b/v2_30_0/CDT-accessControlPolicy-v2_30_0.xsd
index 63062d5e39541371d2f66cda9691fe9347072a23..0cf5c8316e95c17f02fc0cf4a9bf1712958601a4 100644
--- a/v2_30_0/CDT-accessControlPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-accessControlPolicy-v2_30_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_29_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-activeCmdhPolicy-v2_30_0.xsd b/v2_30_0/CDT-activeCmdhPolicy-v2_30_0.xsd
index dd6aa666bfa112bf6b948ff7272dbe7f82c95d92..b8723819dd87f6c169f6f057bb7e4f4eebe8422b 100644
--- a/v2_30_0/CDT-activeCmdhPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-activeCmdhPolicy-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynApp-v2_30_0.xsd b/v2_30_0/CDT-allJoynApp-v2_30_0.xsd
index 4c2e838b97e36d769b6c838bf2100de27a1f3dbf..45a2f626ad08da8c7adb81628bb7e7477baa95ec 100644
--- a/v2_30_0/CDT-allJoynApp-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynApp-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_29_0.xsd" />
+ <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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynInterface-v2_30_0.xsd b/v2_30_0/CDT-allJoynInterface-v2_30_0.xsd
index 6262469461e8617c8f54cfe11cb03362b6ff97f3..6aa8f64e3355c30a221b44a5909088bb2fe8703d 100644
--- a/v2_30_0/CDT-allJoynInterface-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynInterface-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
+ <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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_30_0/CDT-allJoynMethod-v2_30_0.xsd b/v2_30_0/CDT-allJoynMethod-v2_30_0.xsd
index 6a7be4b6755b29dd9d89f261e70dd09e28ec31d7..0d50c39ce6d603ead6d19c8da107a4b4cac83ecc 100644
--- a/v2_30_0/CDT-allJoynMethod-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynMethod-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_29_0.xsd" />
+ <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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_30_0/CDT-allJoynMethodCall-v2_30_0.xsd b/v2_30_0/CDT-allJoynMethodCall-v2_30_0.xsd
index 8207de059d7d0b75cfb7976276f8a3156f801c52..a708c0e770f8c6efc9d8760c4fe09bb53d78a996 100644
--- a/v2_30_0/CDT-allJoynMethodCall-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynMethodCall-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynProperty-v2_30_0.xsd b/v2_30_0/CDT-allJoynProperty-v2_30_0.xsd
index b739bebfd40ed6a941d39e5c8b18d91c9c79f2d1..c55328686fead48c45efdd5bc0fa77f8094ef8a5 100644
--- a/v2_30_0/CDT-allJoynProperty-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynProperty-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-allJoynSvcObject-v2_30_0.xsd b/v2_30_0/CDT-allJoynSvcObject-v2_30_0.xsd
index bbb1f1ed7e15b042df88acc1e1b1ec89fa256d2d..0b003c06bdb786997b32929b51cdcea8b3039b0d 100644
--- a/v2_30_0/CDT-allJoynSvcObject-v2_30_0.xsd
+++ b/v2_30_0/CDT-allJoynSvcObject-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_29_0.xsd" />
+ <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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_0.xsd b/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_0.xsd
index a865ef5a2495300d389f1b88f636ed5ca7c847ee..fc3193acb8563b0e70e96db221ebef9543d2a0c3 100644
--- a/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_0.xsd
+++ b/v2_30_0/CDT-areaNwkDeviceInfo-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-areaNwkInfo-v2_30_0.xsd b/v2_30_0/CDT-areaNwkInfo-v2_30_0.xsd
index 83901955ffa5f0e436ae3099e3531f7f0296e204..130f07a8992b5b5d75c1ce8de13ffafcb28942b9 100644
--- a/v2_30_0/CDT-areaNwkInfo-v2_30_0.xsd
+++ b/v2_30_0/CDT-areaNwkInfo-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-battery-v2_30_0.xsd b/v2_30_0/CDT-battery-v2_30_0.xsd
index 0b62a43802f64e8e6898799e2d600a685f27e7e1..969eef8e1d0e0b7df0550d06d068584ac6db4e8d 100644
--- a/v2_30_0/CDT-battery-v2_30_0.xsd
+++ b/v2_30_0/CDT-battery-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhBuffer-v2_30_0.xsd b/v2_30_0/CDT-cmdhBuffer-v2_30_0.xsd
index f94075ce303ab9c0dff99734a194c14ea45e0e5a..f1b37ca4168e043813ddfc44d603ee4fbe02e719 100644
--- a/v2_30_0/CDT-cmdhBuffer-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhBuffer-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhDefEcValue-v2_30_0.xsd b/v2_30_0/CDT-cmdhDefEcValue-v2_30_0.xsd
index 3552ba53b3f49000c6d1706bc369d5f457d00ca4..61d1f928c04deafb5059c5c15d8c559fdf776650 100644
--- a/v2_30_0/CDT-cmdhDefEcValue-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhDefEcValue-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhDefaults-v2_30_0.xsd b/v2_30_0/CDT-cmdhDefaults-v2_30_0.xsd
index 872339951ae55cffeb2a47ea13953ac5d88c8ae9..a4d7dfd358ce8bd2f734d6f843ac8cb09317866f 100644
--- a/v2_30_0/CDT-cmdhDefaults-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhDefaults-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_0.xsd b/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_0.xsd
index d9e047721eae2085e3927732fccdcfa7d728c1b0..09e0df1eaa0a30312e0245bbec45bd5d90ee76fc 100644
--- a/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhEcDefParamValues-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhLimits-v2_30_0.xsd b/v2_30_0/CDT-cmdhLimits-v2_30_0.xsd
index f8880a38f7eff6795c2e62f447177ddec4a0b22d..c9a7cb9f57ff560a00e3a3114a0dbc12c5e4e178 100644
--- a/v2_30_0/CDT-cmdhLimits-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhLimits-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_0.xsd b/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_0.xsd
index 3c992f997f8802292dc61977ff8b91ad93e98de2..48e73886da1b310ac72642edeaad0bfc651ef555 100644
--- a/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhNetworkAccessRules-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhNwAccessRule-v2_30_0.xsd b/v2_30_0/CDT-cmdhNwAccessRule-v2_30_0.xsd
index a29499a604432ab5595439e3237265933fe6ad64..793fe8072134225531633cb6237147918822ded7 100644
--- a/v2_30_0/CDT-cmdhNwAccessRule-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhNwAccessRule-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-cmdhPolicy-v2_30_0.xsd b/v2_30_0/CDT-cmdhPolicy-v2_30_0.xsd
index 42e4e8a9394710507615f1f8c8c4377e029f7d24..177f6c886d6255a1e70959ba757c06a3efca7592 100644
--- a/v2_30_0/CDT-cmdhPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-cmdhPolicy-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-commonTypes-v2_30_0.xsd b/v2_30_0/CDT-commonTypes-v2_30_0.xsd
index 5221aadae0269104cd790ab35eb006e074e7cd06..49196a1fdf9d59dbae2c2c9cbd8ca8fe90e8587b 100644
--- a/v2_30_0/CDT-commonTypes-v2_30_0.xsd
+++ b/v2_30_0/CDT-commonTypes-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_30_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_30_0/CDT-container-v2_30_0.xsd b/v2_30_0/CDT-container-v2_30_0.xsd
index 7c9d64ac86f8b52dd755274da4ff049ea3288c75..78e35a4c71880d9786ac79f20ed7543319944c00 100644
--- a/v2_30_0/CDT-container-v2_30_0.xsd
+++ b/v2_30_0/CDT-container-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
+ <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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_30_0/CDT-contentInstance-v2_30_0.xsd b/v2_30_0/CDT-contentInstance-v2_30_0.xsd
index ccd8e7fa57f2b9bc14310e01d615b434adc18472..89886869f9fd1c55a968dc056302e20d9dca61d2 100644
--- a/v2_30_0/CDT-contentInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-contentInstance-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_30_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-delivery-v2_30_0.xsd b/v2_30_0/CDT-delivery-v2_30_0.xsd
index 8a09d09c740df100cd7e9d80f465ec000312a071..4af2241f17a6f91f1eddc57f951563641ab78dea 100644
--- a/v2_30_0/CDT-delivery-v2_30_0.xsd
+++ b/v2_30_0/CDT-delivery-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_30_0/CDT-deviceCapability-v2_30_0.xsd b/v2_30_0/CDT-deviceCapability-v2_30_0.xsd
index f4cdc2d62b41def5b097e1305defcf4143efd9b9..9e79a5befe0efffe70ad6c9fb17dbd337d9d361a 100644
--- a/v2_30_0/CDT-deviceCapability-v2_30_0.xsd
+++ b/v2_30_0/CDT-deviceCapability-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-deviceInfo-v2_30_0.xsd b/v2_30_0/CDT-deviceInfo-v2_30_0.xsd
index 6ca0cfa09a35bf9c91c1ffb6a03da4eb49aaa6f8..e960a27cb290b386389cd93ab66fb801853ea3c8 100644
--- a/v2_30_0/CDT-deviceInfo-v2_30_0.xsd
+++ b/v2_30_0/CDT-deviceInfo-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_0.xsd b/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_0.xsd
index 29f0d0762e5d9539bb3d66fe6df46e12ffeceebf..71ec0cc199d2e1f4d655a9770f8509e166b4ea75 100644
--- a/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_0.xsd
+++ b/v2_30_0/CDT-dynamicAuthorizationConsultation-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-eventConfig-v2_30_0.xsd b/v2_30_0/CDT-eventConfig-v2_30_0.xsd
index f3929a33112bfc8bf0844168483a1a7c44a2a511..546d5ae3b5c419fda5de6ef2ca1f20b46bab0155 100644
--- a/v2_30_0/CDT-eventConfig-v2_30_0.xsd
+++ b/v2_30_0/CDT-eventConfig-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-eventLog-v2_30_0.xsd b/v2_30_0/CDT-eventLog-v2_30_0.xsd
index 979e1fe9e17f9e18449a6b4a6435d358d41a292a..f940a3927c161c5e10df2b98ea15d06cf7c5b468 100644
--- a/v2_30_0/CDT-eventLog-v2_30_0.xsd
+++ b/v2_30_0/CDT-eventLog-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-execInstance-v2_30_0.xsd b/v2_30_0/CDT-execInstance-v2_30_0.xsd
index b7ab8cc924b626d14420422786848a372809a2fa..9a08f5dc02f2f91e813eacc64d50b98da98d6e61 100644
--- a/v2_30_0/CDT-execInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-execInstance-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-firmware-v2_30_0.xsd b/v2_30_0/CDT-firmware-v2_30_0.xsd
index 8b5e255fb30f3aeadc75ae2e5f2929214056ba5e..9386867175c5fe01fb806e14fbd9da3df30569da 100644
--- a/v2_30_0/CDT-firmware-v2_30_0.xsd
+++ b/v2_30_0/CDT-firmware-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_0.xsd b/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_0.xsd
index 7835be97db9411bb736a719dfaa56d28ba6850ea..fded4791012a2f925dfca60035b55356873607e0 100644
--- a/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-genericInterworkingOperationInstance-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-genericInterworkingService-v2_30_0.xsd b/v2_30_0/CDT-genericInterworkingService-v2_30_0.xsd
index f5ac2be7cc84eb28d7d8b909940a939f34a18c36..08898b21e36166322024347908134728b0038a59 100644
--- a/v2_30_0/CDT-genericInterworkingService-v2_30_0.xsd
+++ b/v2_30_0/CDT-genericInterworkingService-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_29_0.xsd" />
+ <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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-group-v2_30_0.xsd b/v2_30_0/CDT-group-v2_30_0.xsd
index 15003b91cb92aadccfee033c2e64f7732db880bc..1d8eb084f56336d3c8a9e57d7132e21de9b26867 100644
--- a/v2_30_0/CDT-group-v2_30_0.xsd
+++ b/v2_30_0/CDT-group-v2_30_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_29_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd"/>
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd"/>
+ <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:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-locationPolicy-v2_30_0.xsd b/v2_30_0/CDT-locationPolicy-v2_30_0.xsd
index b59ac916c2d58c7a573cc6f351c89503945415b9..eca47cc885ae4fd3e97a419776b01697d5ee6ed3 100644
--- a/v2_30_0/CDT-locationPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-locationPolicy-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd b/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd
index 319b98f311aac2319ef622083a0d3defbd4ad4a3..18f11831cd4da96582209ab9a2fe8caddc683b2c 100644
--- a/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_0.xsd
+++ b/v2_30_0/CDT-m2mServiceSubscriptionProfile-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_29_0.xsd" />
+ <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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-memory-v2_30_0.xsd b/v2_30_0/CDT-memory-v2_30_0.xsd
index e16b74b2e012c364c90b7b4e74aa6191c2544899..1d2df42b14ed87a76902c7790ba20c01c33536d2 100644
--- a/v2_30_0/CDT-memory-v2_30_0.xsd
+++ b/v2_30_0/CDT-memory-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-mgmtCmd-v2_30_0.xsd b/v2_30_0/CDT-mgmtCmd-v2_30_0.xsd
index 06327fab23dd913ad399a17ac10dcb153cf1db79..9096a55749ccba79fbe5e371c7cd5905ff84907b 100644
--- a/v2_30_0/CDT-mgmtCmd-v2_30_0.xsd
+++ b/v2_30_0/CDT-mgmtCmd-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_29_0.xsd" />
+ <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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-node-v2_30_0.xsd b/v2_30_0/CDT-node-v2_30_0.xsd
index 92bbb5a0e22ed6158210787f5e29efa2ad4bd88a..3809b16302ba25f02f3f6d3fd8690ae7f79ea988 100644
--- a/v2_30_0/CDT-node-v2_30_0.xsd
+++ b/v2_30_0/CDT-node-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_29_0.xsd" />
+ <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:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-notification-v2_30_0.xsd b/v2_30_0/CDT-notification-v2_30_0.xsd
index 02af075266d283627caca67ed3ab01f855b7926d..442ec9ba712d8a3bd8b82686800b0557066153e5 100644
--- a/v2_30_0/CDT-notification-v2_30_0.xsd
+++ b/v2_30_0/CDT-notification-v2_30_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_29_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_29_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_30_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd b/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd
index a0c00037b0fed9add9593da73f99a559c929178a..8f42f0d5764329f3d9c57e51861f5f03bf0d5279 100644
--- a/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_0.xsd
+++ b/v2_30_0/CDT-notificationTargetMgmtPolicyRef-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-notificationTargetPolicy-v2_30_0.xsd b/v2_30_0/CDT-notificationTargetPolicy-v2_30_0.xsd
index d7dab7480bc09d20c65c3843ea9bb35bd5b12f08..f07741da2f9e59d3ce7545729050f6fedc8164c6 100644
--- a/v2_30_0/CDT-notificationTargetPolicy-v2_30_0.xsd
+++ b/v2_30_0/CDT-notificationTargetPolicy-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-policyDeletionRules-v2_30_0.xsd b/v2_30_0/CDT-policyDeletionRules-v2_30_0.xsd
index b7bfbb1681e1253c3eeb4389526f06d37eaa94ca..a8821c411936958f8feda3299bad6eb4bd95775c 100644
--- a/v2_30_0/CDT-policyDeletionRules-v2_30_0.xsd
+++ b/v2_30_0/CDT-policyDeletionRules-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-pollingChannel-v2_30_0.xsd b/v2_30_0/CDT-pollingChannel-v2_30_0.xsd
index c3e45300adba7b547391e85cb1e53e2814b12a23..6b95fc04463def5243df1562d0fb3ba7b7d70e8c 100644
--- a/v2_30_0/CDT-pollingChannel-v2_30_0.xsd
+++ b/v2_30_0/CDT-pollingChannel-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-reboot-v2_30_0.xsd b/v2_30_0/CDT-reboot-v2_30_0.xsd
index 717e12aed0086f17eea77acdc6af0d34d42bf5a6..0756c96b3622c04e76d33dfc7d49e0fb5ec8059a 100644
--- a/v2_30_0/CDT-reboot-v2_30_0.xsd
+++ b/v2_30_0/CDT-reboot-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-remoteCSE-v2_30_0.xsd b/v2_30_0/CDT-remoteCSE-v2_30_0.xsd
index aef817673e35cdbf15ccbdad68a656e6bbb758d4..77f429bf13fe8490373d6fecea351487eaa3393f 100644
--- a/v2_30_0/CDT-remoteCSE-v2_30_0.xsd
+++ b/v2_30_0/CDT-remoteCSE-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_29_0.xsd" />
+ <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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-request-v2_30_0.xsd b/v2_30_0/CDT-request-v2_30_0.xsd
index cdd3d60e4f1163c89c18ef38370a186f14c46019..ef38fd7c2d688f060b7c11047bbf2ee72260900f 100644
--- a/v2_30_0/CDT-request-v2_30_0.xsd
+++ b/v2_30_0/CDT-request-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-requestPrimitive-v2_30_0.xsd b/v2_30_0/CDT-requestPrimitive-v2_30_0.xsd
index 82e443eb37e4a18c15e92d5e4ab24c7c2e64fede..a6db7054e63f4dd3e85569f125236ada02c8b5d3 100644
--- a/v2_30_0/CDT-requestPrimitive-v2_30_0.xsd
+++ b/v2_30_0/CDT-requestPrimitive-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd b/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd
index b30e60fc51f36ebbd7af459ee68c5b07fb73ac50..635a1abb6ce796e34550df55731521416793c451 100644
--- a/v2_30_0/CDT-responsePrimitive-v2_30_0.xsd
+++ b/v2_30_0/CDT-responsePrimitive-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_29_0.xsd" />
+ <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:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_30_0/CDT-role-v2_30_0.xsd b/v2_30_0/CDT-role-v2_30_0.xsd
index d3d8f52eba20a5bcc05498b0ab92e6dec1f2e8e1..036222708940204716e0e59ba10807d70a8e1bbf 100644
--- a/v2_30_0/CDT-role-v2_30_0.xsd
+++ b/v2_30_0/CDT-role-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-schedule-v2_30_0.xsd b/v2_30_0/CDT-schedule-v2_30_0.xsd
index 889632d6730e78c394d1ffb288bddf1ea5fe5281..f65ba3303adf5c82101a5b0e1c1575958bc670b7 100644
--- a/v2_30_0/CDT-schedule-v2_30_0.xsd
+++ b/v2_30_0/CDT-schedule-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-semanticDescriptor-v2_30_0.xsd b/v2_30_0/CDT-semanticDescriptor-v2_30_0.xsd
index 3c7a748b9363ebde59a9da7ddcde851f0305632b..f2586b9c436ab51e5e0c34b1d8759bf0519e5796 100644
--- a/v2_30_0/CDT-semanticDescriptor-v2_30_0.xsd
+++ b/v2_30_0/CDT-semanticDescriptor-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_0.xsd b/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_0.xsd
index bea0a66d08b21dec2be2ca7e12e6308e07ba9103..a6c715f2bdaefc5aae7c07a0cfeba060b8a1692b 100644
--- a/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_0.xsd
+++ b/v2_30_0/CDT-serviceSubscribedAppRule-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-serviceSubscribedNode-v2_30_0.xsd b/v2_30_0/CDT-serviceSubscribedNode-v2_30_0.xsd
index b2b298a8f1f8267b26dbcc9f333f4d4b1c3dec91..fde53bddf3ef49aa65c792966981f6b353f9d939 100644
--- a/v2_30_0/CDT-serviceSubscribedNode-v2_30_0.xsd
+++ b/v2_30_0/CDT-serviceSubscribedNode-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-software-v2_30_0.xsd b/v2_30_0/CDT-software-v2_30_0.xsd
index ed10bd4699a554eab69b793425b3e8c6fe317d22..3b3be66357a312edf87c50bd3fe1088f7acff26d 100644
--- a/v2_30_0/CDT-software-v2_30_0.xsd
+++ b/v2_30_0/CDT-software-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-statsCollect-v2_30_0.xsd b/v2_30_0/CDT-statsCollect-v2_30_0.xsd
index 1c5fd860251868f036cc1c70922f3d5cd6066e8c..c2e33193c8cb009f5a712b314898e6d71d5f7eed 100644
--- a/v2_30_0/CDT-statsCollect-v2_30_0.xsd
+++ b/v2_30_0/CDT-statsCollect-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-statsConfig-v2_30_0.xsd b/v2_30_0/CDT-statsConfig-v2_30_0.xsd
index 3862b57c820c1f73e90ec2ddeb0c5441657a08d0..2e22aaa45c74e262e7c0ccbc810d009e6c7fff4d 100644
--- a/v2_30_0/CDT-statsConfig-v2_30_0.xsd
+++ b/v2_30_0/CDT-statsConfig-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-subscription-v2_30_0.xsd b/v2_30_0/CDT-subscription-v2_30_0.xsd
index abaad11cea1382d172c36cd5c031825854628db1..a478fb8acd1e8cdc1fe3237b195ace905dbb43f0 100644
--- a/v2_30_0/CDT-subscription-v2_30_0.xsd
+++ b/v2_30_0/CDT-subscription-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_29_0.xsd" />
+ <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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-svcFwWrapper-v2_30_0.xsd b/v2_30_0/CDT-svcFwWrapper-v2_30_0.xsd
index c4d3ade79ed2e37294ef85ce4fad05bc6cab9cca..1f0fd10d095c0c4bae62c129919f22aeb1f73bbb 100644
--- a/v2_30_0/CDT-svcFwWrapper-v2_30_0.xsd
+++ b/v2_30_0/CDT-svcFwWrapper-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
+ <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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-svcObjWrapper-v2_30_0.xsd b/v2_30_0/CDT-svcObjWrapper-v2_30_0.xsd
index 3c5fbdc61f982140b13be381efe6d637ba940df7..a4a5c6eb004a71bf72a9672da71d651777131dc3 100644
--- a/v2_30_0/CDT-svcObjWrapper-v2_30_0.xsd
+++ b/v2_30_0/CDT-svcObjWrapper-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_29_0.xsd" />
+ <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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-timeSeries-v2_30_0.xsd b/v2_30_0/CDT-timeSeries-v2_30_0.xsd
index 54485153c241dabdebea58aef6bb1c6a4c6fa1cc..0b7c118aa44abfa7a8bcc8973a71148506106e61 100644
--- a/v2_30_0/CDT-timeSeries-v2_30_0.xsd
+++ b/v2_30_0/CDT-timeSeries-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_29_0.xsd" />
+ <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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_30_0/CDT-timeSeriesInstance-v2_30_0.xsd b/v2_30_0/CDT-timeSeriesInstance-v2_30_0.xsd
index ce701af66fa32b1bda85dbc638aef7dfb619b11c..35635c70d365bc0b1f026bba1dc0d524e4144938 100644
--- a/v2_30_0/CDT-timeSeriesInstance-v2_30_0.xsd
+++ b/v2_30_0/CDT-timeSeriesInstance-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_30_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-token-v2_30_0.xsd b/v2_30_0/CDT-token-v2_30_0.xsd
index a530ae7f5c8edb843a271fd13008c4b68b0720cc..e262f065c37cded4cf23e588dcd6f5eab76eb5f7 100644
--- a/v2_30_0/CDT-token-v2_30_0.xsd
+++ b/v2_30_0/CDT-token-v2_30_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_29_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_30_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_30_0/CDT-trafficPattern-v2_30_0.xsd b/v2_30_0/CDT-trafficPattern-v2_30_0.xsd
index 8191bee1aa46f815d3db472d42f8336ae3507404..553f112397b2ae971b4c2f07b6f4588c62bb5325 100644
--- a/v2_30_0/CDT-trafficPattern-v2_30_0.xsd
+++ b/v2_30_0/CDT-trafficPattern-v2_30_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_29_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_29_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_29_0.xsd" />
+ <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:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>