diff --git a/v2_16_0/CDT-AE-v2_16_0.xsd b/v2_16_0/CDT-AE-v2_16_0.xsd
index 808a68db1499fd310517f2ed783e24f47255c16b..a034623b326e50ba08228ad06faf06c287f93ffd 100644
--- a/v2_16_0/CDT-AE-v2_16_0.xsd
+++ b/v2_16_0/CDT-AE-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_16_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-CSEBase-v2_16_0.xsd b/v2_16_0/CDT-CSEBase-v2_16_0.xsd
index 281689f15c96279d825769f71fc0d8a7bc06feb5..3fb77ebd15fcb10080314df0fb8969cbbcd87285 100644
--- a/v2_16_0/CDT-CSEBase-v2_16_0.xsd
+++ b/v2_16_0/CDT-CSEBase-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_16_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd b/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd
index f5ed44c79d8b011afbee4a6941d326c4c5782fbc..f61d45a6cffd83c3e7295daf752676356de16a2d 100644
--- a/v2_16_0/CDT-accessControlPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-accessControlPolicy-v2_16_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_15_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd b/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd
index e029d171efe0df81fa43d8d1ab9d4fe49c39c91d..2fbaf0ba48a9ddba2a921b80f043702b30be3753 100644
--- a/v2_16_0/CDT-activeCmdhPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-activeCmdhPolicy-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynApp-v2_16_0.xsd b/v2_16_0/CDT-allJoynApp-v2_16_0.xsd
index e3ffdc7ca3edee429caaf70a362e1d5c3aa18faa..49d5322c82506fc25f942e805828e9738e248d2f 100644
--- a/v2_16_0/CDT-allJoynApp-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynApp-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_16_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd b/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd
index 5fcde685d06f56510eac12b52a72c17b5327f9d5..915fdf5c8bd404191bd5041e5245281e19da2554 100644
--- a/v2_16_0/CDT-allJoynInterface-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynInterface-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd b/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd
index c00069e58fb3b1ce15b504d28623f45deab42c77..f9869f805323a24e51fcba4852f28664c934a7ab 100644
--- a/v2_16_0/CDT-allJoynMethod-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynMethod-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_16_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd b/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd
index 3870c4b56dbe7174ef12901b07f6777bc1cb12db..7803cb56f24c034f728007f8c79332e66c8b91f8 100644
--- a/v2_16_0/CDT-allJoynMethodCall-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynMethodCall-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd b/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd
index c1bdcd52ad8bbeac2ffd4bff9dcf3691ff828d4a..848db171cdda1d7d5df6671647efcb45f954579c 100644
--- a/v2_16_0/CDT-allJoynProperty-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynProperty-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd b/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd
index ba1e3c7bf38c23cb5e12fd1101da2b2c370a6421..f4821b7aa9df2629876f1e21360d038f1c8c306f 100644
--- a/v2_16_0/CDT-allJoynSvcObject-v2_16_0.xsd
+++ b/v2_16_0/CDT-allJoynSvcObject-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_16_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd b/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd
index ff695fa69dc474b042e92ca3ce2b8b3824d4bd20..234fd02c1d06c0e977d7d80ee9200787ef48a5da 100644
--- a/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_0.xsd
+++ b/v2_16_0/CDT-areaNwkDeviceInfo-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd b/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd
index fceb36987e56d61aca306d8f2268faf26ce4ac49..2e7419557b042d4c5b76383b36e93a68f2cbd287 100644
--- a/v2_16_0/CDT-areaNwkInfo-v2_16_0.xsd
+++ b/v2_16_0/CDT-areaNwkInfo-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-battery-v2_16_0.xsd b/v2_16_0/CDT-battery-v2_16_0.xsd
index a1c28754cb95780e799f3527695257ea1ca92e70..a106587de5358d0ddbe9abfa26500eb2ea300467 100644
--- a/v2_16_0/CDT-battery-v2_16_0.xsd
+++ b/v2_16_0/CDT-battery-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd b/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd
index 20c5aaa346c2a413f7f83b8871b13fcd55a4f66b..7fbec2ea8d4403ca4e7f8a1ea2a271d5f8249c6a 100644
--- a/v2_16_0/CDT-cmdhBuffer-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhBuffer-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd b/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd
index 503ef4a1eeadd5b8592330771218595bbeb39195..2d69246820da0f03bbb5630c19804ca367b2d1b2 100644
--- a/v2_16_0/CDT-cmdhDefEcValue-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhDefEcValue-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd b/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd
index b98a61ec13b207741dc20fba6e4b59d17af0eb6d..44e692a8e0c0a93b98615974abdded46f617a777 100644
--- a/v2_16_0/CDT-cmdhDefaults-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhDefaults-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd b/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd
index 524c7e5e9c9fc7b83a269bd1b3fa7fe090b92bf8..20adb3c088aaf21d2413bf9e2e233fab3956220e 100644
--- a/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhEcDefParamValues-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd b/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd
index 2146ec769dacacac782c72316b3e6db5dddf2893..d3d2966a3778c0438838610c149c7592d1c49437 100644
--- a/v2_16_0/CDT-cmdhLimits-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhLimits-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd b/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd
index 71524ac37248680d31b7b67681e6e20f4bd13fd7..87b4837618c166fc914bc087788ab87397629d97 100644
--- a/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhNetworkAccessRules-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd b/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd
index 137fcc36dc9dd0b4b8bda671f7e0e0a6e6dd5ea9..103162cb9d99dd5f4138cbe0d6caa3edbf7eff1d 100644
--- a/v2_16_0/CDT-cmdhNwAccessRule-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhNwAccessRule-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd b/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd
index 99f81a26233ba29fdc1b1a4fb456918402188540..446fb39c98e744f27ba0fbaef5a7be8789e76bae 100644
--- a/v2_16_0/CDT-cmdhPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-cmdhPolicy-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-commonTypes-v2_16_0.xsd b/v2_16_0/CDT-commonTypes-v2_16_0.xsd
index 5966aeb9ded867459bda518fbcaeb77694b9cd23..dc4a93c2f1d04ed6b313d73d54adb38b96c7ee48 100644
--- a/v2_16_0/CDT-commonTypes-v2_16_0.xsd
+++ b/v2_16_0/CDT-commonTypes-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_16_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_16_0/CDT-container-v2_16_0.xsd b/v2_16_0/CDT-container-v2_16_0.xsd
index 3b654a05eea9d23cf499a6870959a559479bad47..1af6423b4f9e59db70e6d83528bb2c270171ba32 100644
--- a/v2_16_0/CDT-container-v2_16_0.xsd
+++ b/v2_16_0/CDT-container-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_16_0/CDT-contentInstance-v2_16_0.xsd b/v2_16_0/CDT-contentInstance-v2_16_0.xsd
index 0b7c1d1440c1b97ad826e2013d7fa1bf7ef0ec94..5f6776dba3e98d1e5fd4522c3b52ba7d98c84360 100644
--- a/v2_16_0/CDT-contentInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-contentInstance-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-delivery-v2_16_0.xsd b/v2_16_0/CDT-delivery-v2_16_0.xsd
index bf2401e197d2fbbfe88ff77be44f2aaf82960deb..b1e798568d23ad688d08f659f05190abf1f07a38 100644
--- a/v2_16_0/CDT-delivery-v2_16_0.xsd
+++ b/v2_16_0/CDT-delivery-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_16_0/CDT-deviceCapability-v2_16_0.xsd b/v2_16_0/CDT-deviceCapability-v2_16_0.xsd
index 7d51a084216f8c048ebb51a416e2474e5ac02a6e..bb76961b58865186b8d26e4f913476d7da4b84f5 100644
--- a/v2_16_0/CDT-deviceCapability-v2_16_0.xsd
+++ b/v2_16_0/CDT-deviceCapability-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-deviceInfo-v2_16_0.xsd b/v2_16_0/CDT-deviceInfo-v2_16_0.xsd
index 0f11a16db5cab5bc89d0bb6fd5d1050342acdc60..5f008e15a26e3a99b0d399818d84f3f96254e617 100644
--- a/v2_16_0/CDT-deviceInfo-v2_16_0.xsd
+++ b/v2_16_0/CDT-deviceInfo-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd b/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd
index afca605f0c81ce495fc3b6ae8f6bb58d1535079a..dcc9b2a321ad8a8f84bede9d6cbe69ce1c05b4c6 100644
--- a/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_0.xsd
+++ b/v2_16_0/CDT-dynamicAuthorizationConsultation-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-eventConfig-v2_16_0.xsd b/v2_16_0/CDT-eventConfig-v2_16_0.xsd
index 126234eac10d06341e821dc6c17061e6778e2de7..83b41fc700f3b98654416cfc16a100b7b1ef51bf 100644
--- a/v2_16_0/CDT-eventConfig-v2_16_0.xsd
+++ b/v2_16_0/CDT-eventConfig-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-eventLog-v2_16_0.xsd b/v2_16_0/CDT-eventLog-v2_16_0.xsd
index c40e465b938123c5b81bf243ea3db701cc85a3de..52ee3187c9409b5c8c588517ceabbbf520d5a39e 100644
--- a/v2_16_0/CDT-eventLog-v2_16_0.xsd
+++ b/v2_16_0/CDT-eventLog-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-execInstance-v2_16_0.xsd b/v2_16_0/CDT-execInstance-v2_16_0.xsd
index b70540062e8c7882fd0d094211098327acd02a90..16c59f447f3ec109b6651e793d5dda2e2a501f3e 100644
--- a/v2_16_0/CDT-execInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-execInstance-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-firmware-v2_16_0.xsd b/v2_16_0/CDT-firmware-v2_16_0.xsd
index b8d5e4f529bfbe19daf3e37a104dbcc6536cfc3c..1ad968a74ca550d45f2548f89769c21308357497 100644
--- a/v2_16_0/CDT-firmware-v2_16_0.xsd
+++ b/v2_16_0/CDT-firmware-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd b/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd
index a0dcdeca7d918be1866ff3adc95bcf9fc62ff7ca..c5c62888f71e48ce55910eb0177a1814044ee816 100644
--- a/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-genericInterworkingOperationInstance-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd b/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd
index af0be10dd8703d871f90565a686b6796385ab409..04b721d2c3bd70a6c230aaf4c8598717c45179da 100644
--- a/v2_16_0/CDT-genericInterworkingService-v2_16_0.xsd
+++ b/v2_16_0/CDT-genericInterworkingService-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_16_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-group-v2_16_0.xsd b/v2_16_0/CDT-group-v2_16_0.xsd
index 6605284d17b15dd837b36e902cab76d9545fe1f1..15d782ada654d9b3776b8116616a9e76e536d35b 100644
--- a/v2_16_0/CDT-group-v2_16_0.xsd
+++ b/v2_16_0/CDT-group-v2_16_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" 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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-locationPolicy-v2_16_0.xsd b/v2_16_0/CDT-locationPolicy-v2_16_0.xsd
index 9ce06daaa60499918a6769fe6cc77f06636b9487..921dfdf30488c2764db7eb027ea593ad18cb4c11 100644
--- a/v2_16_0/CDT-locationPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-locationPolicy-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd b/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd
index 7deab487318b4c429d4d194ee7810169fa3686a6..00337a214a6309bc64650d7a9297f2212a344729 100644
--- a/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd
+++ b/v2_16_0/CDT-m2mServiceSubscriptionProfile-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_16_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-memory-v2_16_0.xsd b/v2_16_0/CDT-memory-v2_16_0.xsd
index 3cbdded0a6f4d0d075cb95a3ed746d661fb69fcb..e6feb721c48616a57a81f3be3d15ad3753d06529 100644
--- a/v2_16_0/CDT-memory-v2_16_0.xsd
+++ b/v2_16_0/CDT-memory-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd b/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd
index 376790c412702a4bfdd1a4bdea68d0f1af2077c1..3111e1727c731ba11661534ef826fd7a312b2fc5 100644
--- a/v2_16_0/CDT-mgmtCmd-v2_16_0.xsd
+++ b/v2_16_0/CDT-mgmtCmd-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_16_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-node-v2_16_0.xsd b/v2_16_0/CDT-node-v2_16_0.xsd
index f2bff822fc323e966b31d6d82c83410cc8c6c87c..1a236a5b2b9fac489c979efb4fd086591277b1c6 100644
--- a/v2_16_0/CDT-node-v2_16_0.xsd
+++ b/v2_16_0/CDT-node-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_16_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-notification-v2_16_0.xsd b/v2_16_0/CDT-notification-v2_16_0.xsd
index 97ac3fe9ce378a7fb31baa3b100544bcef8e11d1..7bfb30eccf3e0995c8b1accc5ec99dbd6684d7df 100644
--- a/v2_16_0/CDT-notification-v2_16_0.xsd
+++ b/v2_16_0/CDT-notification-v2_16_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_15_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_15_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_16_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd b/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd
index 252c7d5e903ba673e2d94a38c106549c6a175af1..27005f977b5f25d21cc9a763a25a656935954c65 100644
--- a/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd
+++ b/v2_16_0/CDT-notificationTargetMgmtPolicyRef-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd b/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd
index 9b1ca6d8efe98ca69962f4e06de50ebaa0e0acd9..1b102de5a09f96e671a5a25357a66993b41f4231 100644
--- a/v2_16_0/CDT-notificationTargetPolicy-v2_16_0.xsd
+++ b/v2_16_0/CDT-notificationTargetPolicy-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd b/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd
index b54f2ff8cb444efb23cfce94f592e1b3b01698a5..1907b0afb67c75c0f8fe002f48c429c0f7bf58e7 100644
--- a/v2_16_0/CDT-policyDeletionRules-v2_16_0.xsd
+++ b/v2_16_0/CDT-policyDeletionRules-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-pollingChannel-v2_16_0.xsd b/v2_16_0/CDT-pollingChannel-v2_16_0.xsd
index e2ed9befa93423141ff9eb189eb0160575e8958c..745209cc540078788c8f5aaae4215af3dbc90ddd 100644
--- a/v2_16_0/CDT-pollingChannel-v2_16_0.xsd
+++ b/v2_16_0/CDT-pollingChannel-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-reboot-v2_16_0.xsd b/v2_16_0/CDT-reboot-v2_16_0.xsd
index 4eb7cb4802cda616e07958176f7dbf0636932f60..f9ebdb4cad0696c20bc0e16e088f97c1db69eeca 100644
--- a/v2_16_0/CDT-reboot-v2_16_0.xsd
+++ b/v2_16_0/CDT-reboot-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-remoteCSE-v2_16_0.xsd b/v2_16_0/CDT-remoteCSE-v2_16_0.xsd
index b1d213d379ff7acbbe3dc1ad250134b0d66e68a5..943bbde7422fa017535a8aefe5382c470d7b5ada 100644
--- a/v2_16_0/CDT-remoteCSE-v2_16_0.xsd
+++ b/v2_16_0/CDT-remoteCSE-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_16_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-request-v2_16_0.xsd b/v2_16_0/CDT-request-v2_16_0.xsd
index d2d5fa1f494649bc8547e0a8d5d41bb5fb101cce..cc1f02084e869d73449f18960cd3c5f1707b3653 100644
--- a/v2_16_0/CDT-request-v2_16_0.xsd
+++ b/v2_16_0/CDT-request-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd b/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd
index 7bc93dd88c0b6ed4d864852718930bf0ce6efb36..8b875b64c6c7eb83af400b160b823ad13fea71ec 100644
--- a/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd
+++ b/v2_16_0/CDT-requestPrimitive-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd b/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd
index 833910d13b5e8de9e5b014e96bc446df2d441e71..68a715e739fabe9ddab59ac70eb9b950d0cab04a 100644
--- a/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd
+++ b/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_16_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_16_0/CDT-role-v2_16_0.xsd b/v2_16_0/CDT-role-v2_16_0.xsd
index 690e6ae714be3a4bf1bb22e09333f046f966f6eb..6b1a7da43c6eb1eadf0b0bc9ebee2a058fc0b90a 100644
--- a/v2_16_0/CDT-role-v2_16_0.xsd
+++ b/v2_16_0/CDT-role-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-schedule-v2_16_0.xsd b/v2_16_0/CDT-schedule-v2_16_0.xsd
index 611449d832f47e818eddcecb7ff501e61ae5fa02..b1bbf7981ec8c54d9b951377d6b7a4651b852912 100644
--- a/v2_16_0/CDT-schedule-v2_16_0.xsd
+++ b/v2_16_0/CDT-schedule-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd b/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd
index 55f7cff25911d6e89ff7c9355755683076ed8ae9..231ef6dcd23ba50ff2b96946fbef7191a06e58fd 100644
--- a/v2_16_0/CDT-semanticDescriptor-v2_16_0.xsd
+++ b/v2_16_0/CDT-semanticDescriptor-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd b/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd
index 842de73ec9ad2d9882cb521dd0cf7d77a8cccb92..bbb28bece849976478e1e5405c5b770fd678e07e 100644
--- a/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_0.xsd
+++ b/v2_16_0/CDT-serviceSubscribedAppRule-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd b/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd
index 1711921abc689668072b61252872c4163b94ba94..464f86e94915067aa1f55cfe592d464c188ee23f 100644
--- a/v2_16_0/CDT-serviceSubscribedNode-v2_16_0.xsd
+++ b/v2_16_0/CDT-serviceSubscribedNode-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-software-v2_16_0.xsd b/v2_16_0/CDT-software-v2_16_0.xsd
index 7bf20c973f0b98900d4fc0a2e0d2d9d4916da240..b97bc0c187c1f765a6959ca68be4e0783183db2b 100644
--- a/v2_16_0/CDT-software-v2_16_0.xsd
+++ b/v2_16_0/CDT-software-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-statsCollect-v2_16_0.xsd b/v2_16_0/CDT-statsCollect-v2_16_0.xsd
index 6eee2af4d1086c6200a9bbc271e40f26876ac48f..84ab4edac57e765e52724f4fa05d981c473117c4 100644
--- a/v2_16_0/CDT-statsCollect-v2_16_0.xsd
+++ b/v2_16_0/CDT-statsCollect-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-statsConfig-v2_16_0.xsd b/v2_16_0/CDT-statsConfig-v2_16_0.xsd
index db0d3dc453b8c1016e3ffe3409ca7cd456f3e33e..b5d6b9bb8eb80d9c1e955141aede3be97571e7ef 100644
--- a/v2_16_0/CDT-statsConfig-v2_16_0.xsd
+++ b/v2_16_0/CDT-statsConfig-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-subscription-v2_16_0.xsd b/v2_16_0/CDT-subscription-v2_16_0.xsd
index 1f04f7521bcd55d3a18df66031873a4d683c5ee9..ce403ad9dd1ba92dea3be8a4a8f7f5e1c16bbfae 100644
--- a/v2_16_0/CDT-subscription-v2_16_0.xsd
+++ b/v2_16_0/CDT-subscription-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd b/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd
index d5c7f05f8072ddd8a4dfbaaa489f4b052786a8a6..408675547d9966e72f1aa4ae09bb31b46ae0a3a5 100644
--- a/v2_16_0/CDT-svcFwWrapper-v2_16_0.xsd
+++ b/v2_16_0/CDT-svcFwWrapper-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd b/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd
index 32d80e63dabfc5abcb3755dc5daf8cc141cf9180..9deb02e303668855d7120ea587b92abaf779753c 100644
--- a/v2_16_0/CDT-svcObjWrapper-v2_16_0.xsd
+++ b/v2_16_0/CDT-svcObjWrapper-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_16_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-timeSeries-v2_16_0.xsd b/v2_16_0/CDT-timeSeries-v2_16_0.xsd
index dbf6560a8cf13c985f6d759e4dd0265bd4cf9033..464ae68c8f6acd83f5ffe96f4cd0d58f3d9a288e 100644
--- a/v2_16_0/CDT-timeSeries-v2_16_0.xsd
+++ b/v2_16_0/CDT-timeSeries-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd b/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd
index 90c705d49699e9c41a0229aadf0f63b17f57c7cb..278b3ad66ed5c1a04590c7c6785a03693dbef42f 100644
--- a/v2_16_0/CDT-timeSeriesInstance-v2_16_0.xsd
+++ b/v2_16_0/CDT-timeSeriesInstance-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-token-v2_16_0.xsd b/v2_16_0/CDT-token-v2_16_0.xsd
index 0c7994b93c6ef70050517b2cd71c18813f60d832..2b1431fb549b2a63aafc16243ce264f705dcebac 100644
--- a/v2_16_0/CDT-token-v2_16_0.xsd
+++ b/v2_16_0/CDT-token-v2_16_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_15_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_16_0/CDT-trafficPattern-v2_16_0.xsd b/v2_16_0/CDT-trafficPattern-v2_16_0.xsd
index da43f41e7555242d46c83566b9b99e0fea1ba9af..e30782f5f0ef688b79d51b737c457383e3fcd53d 100644
--- a/v2_16_0/CDT-trafficPattern-v2_16_0.xsd
+++ b/v2_16_0/CDT-trafficPattern-v2_16_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_15_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>