diff --git a/v2_17_0/CDT-AE-v2_17_0.xsd b/v2_17_0/CDT-AE-v2_17_0.xsd
index a034623b326e50ba08228ad06faf06c287f93ffd..aefe07f1aa90001ae4059dd085868ca3a12aa593 100644
--- a/v2_17_0/CDT-AE-v2_17_0.xsd
+++ b/v2_17_0/CDT-AE-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_17_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-CSEBase-v2_17_0.xsd b/v2_17_0/CDT-CSEBase-v2_17_0.xsd
index 3fb77ebd15fcb10080314df0fb8969cbbcd87285..e347435754b25ffff7a45350f6872b0e80b2be08 100644
--- a/v2_17_0/CDT-CSEBase-v2_17_0.xsd
+++ b/v2_17_0/CDT-CSEBase-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_17_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_17_0/CDT-accessControlPolicy-v2_17_0.xsd b/v2_17_0/CDT-accessControlPolicy-v2_17_0.xsd
index f61d45a6cffd83c3e7295daf752676356de16a2d..ea887d4779d80b94aaae20d55eb03b12fd93f24b 100644
--- a/v2_17_0/CDT-accessControlPolicy-v2_17_0.xsd
+++ b/v2_17_0/CDT-accessControlPolicy-v2_17_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_16_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-activeCmdhPolicy-v2_17_0.xsd b/v2_17_0/CDT-activeCmdhPolicy-v2_17_0.xsd
index 2fbaf0ba48a9ddba2a921b80f043702b30be3753..e76967920e699b8798e39dd34428fe326811a340 100644
--- a/v2_17_0/CDT-activeCmdhPolicy-v2_17_0.xsd
+++ b/v2_17_0/CDT-activeCmdhPolicy-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-allJoynApp-v2_17_0.xsd b/v2_17_0/CDT-allJoynApp-v2_17_0.xsd
index 49d5322c82506fc25f942e805828e9738e248d2f..3e2bed5150c4d992636adc951134b085f01af18c 100644
--- a/v2_17_0/CDT-allJoynApp-v2_17_0.xsd
+++ b/v2_17_0/CDT-allJoynApp-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_17_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-allJoynInterface-v2_17_0.xsd b/v2_17_0/CDT-allJoynInterface-v2_17_0.xsd
index 915fdf5c8bd404191bd5041e5245281e19da2554..1cdeef94fbcc51463b691b5d92c733b80b76559e 100644
--- a/v2_17_0/CDT-allJoynInterface-v2_17_0.xsd
+++ b/v2_17_0/CDT-allJoynInterface-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_17_0/CDT-allJoynMethod-v2_17_0.xsd b/v2_17_0/CDT-allJoynMethod-v2_17_0.xsd
index f9869f805323a24e51fcba4852f28664c934a7ab..c7f322c266341c33e2b9a11ecd3646ffc0299e29 100644
--- a/v2_17_0/CDT-allJoynMethod-v2_17_0.xsd
+++ b/v2_17_0/CDT-allJoynMethod-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_17_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_17_0/CDT-allJoynMethodCall-v2_17_0.xsd b/v2_17_0/CDT-allJoynMethodCall-v2_17_0.xsd
index 7803cb56f24c034f728007f8c79332e66c8b91f8..8bed5c177e2d2fa4a938fb622fe6ea3bfcad1474 100644
--- a/v2_17_0/CDT-allJoynMethodCall-v2_17_0.xsd
+++ b/v2_17_0/CDT-allJoynMethodCall-v2_17_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_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-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-allJoynProperty-v2_17_0.xsd b/v2_17_0/CDT-allJoynProperty-v2_17_0.xsd
index 848db171cdda1d7d5df6671647efcb45f954579c..f798a37bc403810b8c9b5c562f40b03ebefb65d6 100644
--- a/v2_17_0/CDT-allJoynProperty-v2_17_0.xsd
+++ b/v2_17_0/CDT-allJoynProperty-v2_17_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_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-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-allJoynSvcObject-v2_17_0.xsd b/v2_17_0/CDT-allJoynSvcObject-v2_17_0.xsd
index f4821b7aa9df2629876f1e21360d038f1c8c306f..c07b688aa83ec73b85df221267563d169e56c8c7 100644
--- a/v2_17_0/CDT-allJoynSvcObject-v2_17_0.xsd
+++ b/v2_17_0/CDT-allJoynSvcObject-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_17_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-areaNwkDeviceInfo-v2_17_0.xsd b/v2_17_0/CDT-areaNwkDeviceInfo-v2_17_0.xsd
index 234fd02c1d06c0e977d7d80ee9200787ef48a5da..715fe0bccdb70584539dfe19068c539973a8ac44 100644
--- a/v2_17_0/CDT-areaNwkDeviceInfo-v2_17_0.xsd
+++ b/v2_17_0/CDT-areaNwkDeviceInfo-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-areaNwkInfo-v2_17_0.xsd b/v2_17_0/CDT-areaNwkInfo-v2_17_0.xsd
index 2e7419557b042d4c5b76383b36e93a68f2cbd287..765472e35fc855a051782983e7fe16a394495795 100644
--- a/v2_17_0/CDT-areaNwkInfo-v2_17_0.xsd
+++ b/v2_17_0/CDT-areaNwkInfo-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-battery-v2_17_0.xsd b/v2_17_0/CDT-battery-v2_17_0.xsd
index a106587de5358d0ddbe9abfa26500eb2ea300467..8352fa273a20325a473701df8c542a677f1b7648 100644
--- a/v2_17_0/CDT-battery-v2_17_0.xsd
+++ b/v2_17_0/CDT-battery-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhBuffer-v2_17_0.xsd b/v2_17_0/CDT-cmdhBuffer-v2_17_0.xsd
index 7fbec2ea8d4403ca4e7f8a1ea2a271d5f8249c6a..8d3c584579968269ac649cc56284d729779a8c30 100644
--- a/v2_17_0/CDT-cmdhBuffer-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhBuffer-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhDefEcValue-v2_17_0.xsd b/v2_17_0/CDT-cmdhDefEcValue-v2_17_0.xsd
index 2d69246820da0f03bbb5630c19804ca367b2d1b2..da40e96259e0a0c18bed9085de9ab9a6c417ec41 100644
--- a/v2_17_0/CDT-cmdhDefEcValue-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhDefEcValue-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhDefaults-v2_17_0.xsd b/v2_17_0/CDT-cmdhDefaults-v2_17_0.xsd
index 44e692a8e0c0a93b98615974abdded46f617a777..68da3920fa6207137e3fcf3706ea0254f8575213 100644
--- a/v2_17_0/CDT-cmdhDefaults-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhDefaults-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhEcDefParamValues-v2_17_0.xsd b/v2_17_0/CDT-cmdhEcDefParamValues-v2_17_0.xsd
index 20adb3c088aaf21d2413bf9e2e233fab3956220e..c604ef9afe1a58d565e8626f6b58e49a036c040a 100644
--- a/v2_17_0/CDT-cmdhEcDefParamValues-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhEcDefParamValues-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhLimits-v2_17_0.xsd b/v2_17_0/CDT-cmdhLimits-v2_17_0.xsd
index d3d2966a3778c0438838610c149c7592d1c49437..9401b682f3b3f07dcf2e0615e90b5b39d5ea6a6f 100644
--- a/v2_17_0/CDT-cmdhLimits-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhLimits-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhNetworkAccessRules-v2_17_0.xsd b/v2_17_0/CDT-cmdhNetworkAccessRules-v2_17_0.xsd
index 87b4837618c166fc914bc087788ab87397629d97..cd3f2d7565d815a1f0aa51cef7a4b05ef69feb09 100644
--- a/v2_17_0/CDT-cmdhNetworkAccessRules-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhNetworkAccessRules-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhNwAccessRule-v2_17_0.xsd b/v2_17_0/CDT-cmdhNwAccessRule-v2_17_0.xsd
index 103162cb9d99dd5f4138cbe0d6caa3edbf7eff1d..5bc573b163f62df204f0776c4ef66612058fac38 100644
--- a/v2_17_0/CDT-cmdhNwAccessRule-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhNwAccessRule-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-cmdhPolicy-v2_17_0.xsd b/v2_17_0/CDT-cmdhPolicy-v2_17_0.xsd
index 446fb39c98e744f27ba0fbaef5a7be8789e76bae..b30ec539feb731e2e61b8773b3fd1828746ca287 100644
--- a/v2_17_0/CDT-cmdhPolicy-v2_17_0.xsd
+++ b/v2_17_0/CDT-cmdhPolicy-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-commonTypes-v2_17_0.xsd b/v2_17_0/CDT-commonTypes-v2_17_0.xsd
index dfd730fedd4072c56d842393f54e9f814b29d6c1..8b5572545f289ae0442b682c90b2e8a7341da5ad 100644
--- a/v2_17_0/CDT-commonTypes-v2_17_0.xsd
+++ b/v2_17_0/CDT-commonTypes-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_17_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_17_0/CDT-container-v2_17_0.xsd b/v2_17_0/CDT-container-v2_17_0.xsd
index 1af6423b4f9e59db70e6d83528bb2c270171ba32..f9581dc268954d469cb48cd62b477b7909649d14 100644
--- a/v2_17_0/CDT-container-v2_17_0.xsd
+++ b/v2_17_0/CDT-container-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_17_0/CDT-contentInstance-v2_17_0.xsd b/v2_17_0/CDT-contentInstance-v2_17_0.xsd
index 5f6776dba3e98d1e5fd4522c3b52ba7d98c84360..a7818db359fce214f1104a9362a6ecb1f048ad12 100644
--- a/v2_17_0/CDT-contentInstance-v2_17_0.xsd
+++ b/v2_17_0/CDT-contentInstance-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-delivery-v2_17_0.xsd b/v2_17_0/CDT-delivery-v2_17_0.xsd
index b1e798568d23ad688d08f659f05190abf1f07a38..a4469dbb48fcc8e9845be73afe50961a7d33f289 100644
--- a/v2_17_0/CDT-delivery-v2_17_0.xsd
+++ b/v2_17_0/CDT-delivery-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_17_0/CDT-deviceCapability-v2_17_0.xsd b/v2_17_0/CDT-deviceCapability-v2_17_0.xsd
index bb76961b58865186b8d26e4f913476d7da4b84f5..c67dd181f4464415790abae33385fe7703fbadca 100644
--- a/v2_17_0/CDT-deviceCapability-v2_17_0.xsd
+++ b/v2_17_0/CDT-deviceCapability-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-deviceInfo-v2_17_0.xsd b/v2_17_0/CDT-deviceInfo-v2_17_0.xsd
index 5f008e15a26e3a99b0d399818d84f3f96254e617..bbc4ffa33b7407d278ec0f32fc67d0a02693e881 100644
--- a/v2_17_0/CDT-deviceInfo-v2_17_0.xsd
+++ b/v2_17_0/CDT-deviceInfo-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-dynamicAuthorizationConsultation-v2_17_0.xsd b/v2_17_0/CDT-dynamicAuthorizationConsultation-v2_17_0.xsd
index dcc9b2a321ad8a8f84bede9d6cbe69ce1c05b4c6..f1fd8c74d00edd52ba95d16547e7e44ecdac56c0 100644
--- a/v2_17_0/CDT-dynamicAuthorizationConsultation-v2_17_0.xsd
+++ b/v2_17_0/CDT-dynamicAuthorizationConsultation-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-eventConfig-v2_17_0.xsd b/v2_17_0/CDT-eventConfig-v2_17_0.xsd
index 83b41fc700f3b98654416cfc16a100b7b1ef51bf..a67ef7a39f256d0620f9e88fa0b8f7104734a328 100644
--- a/v2_17_0/CDT-eventConfig-v2_17_0.xsd
+++ b/v2_17_0/CDT-eventConfig-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-eventLog-v2_17_0.xsd b/v2_17_0/CDT-eventLog-v2_17_0.xsd
index 52ee3187c9409b5c8c588517ceabbbf520d5a39e..ce16a9a9fa23f7a06791b3f8c752887a721e52cb 100644
--- a/v2_17_0/CDT-eventLog-v2_17_0.xsd
+++ b/v2_17_0/CDT-eventLog-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-execInstance-v2_17_0.xsd b/v2_17_0/CDT-execInstance-v2_17_0.xsd
index 16c59f447f3ec109b6651e793d5dda2e2a501f3e..3328892f062b2b670bf67c3cfb6b6df220b953fe 100644
--- a/v2_17_0/CDT-execInstance-v2_17_0.xsd
+++ b/v2_17_0/CDT-execInstance-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-firmware-v2_17_0.xsd b/v2_17_0/CDT-firmware-v2_17_0.xsd
index 1ad968a74ca550d45f2548f89769c21308357497..a6c26ee83a56e2c59870f84a9ee69b281890d775 100644
--- a/v2_17_0/CDT-firmware-v2_17_0.xsd
+++ b/v2_17_0/CDT-firmware-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-genericInterworkingOperationInstance-v2_17_0.xsd b/v2_17_0/CDT-genericInterworkingOperationInstance-v2_17_0.xsd
index c5c62888f71e48ce55910eb0177a1814044ee816..d2ab11e89e6fe66b9dd18f0bfd1d2459f5a16f28 100644
--- a/v2_17_0/CDT-genericInterworkingOperationInstance-v2_17_0.xsd
+++ b/v2_17_0/CDT-genericInterworkingOperationInstance-v2_17_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_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-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-genericInterworkingService-v2_17_0.xsd b/v2_17_0/CDT-genericInterworkingService-v2_17_0.xsd
index 04b721d2c3bd70a6c230aaf4c8598717c45179da..377235f8f84c33088f3cfcb59766dc66208e19f6 100644
--- a/v2_17_0/CDT-genericInterworkingService-v2_17_0.xsd
+++ b/v2_17_0/CDT-genericInterworkingService-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_17_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-group-v2_17_0.xsd b/v2_17_0/CDT-group-v2_17_0.xsd
index cd99f634aa050f6fc9b1552987b9f7d3d6a5c6ab..82ae4a7dd2c44844987a1babe168762e19d2de62 100644
--- a/v2_17_0/CDT-group-v2_17_0.xsd
+++ b/v2_17_0/CDT-group-v2_17_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_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-commonTypes-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-locationPolicy-v2_17_0.xsd b/v2_17_0/CDT-locationPolicy-v2_17_0.xsd
index 921dfdf30488c2764db7eb027ea593ad18cb4c11..b7f6db0f89f6e46dc49f65e1dd50593fb513b4af 100644
--- a/v2_17_0/CDT-locationPolicy-v2_17_0.xsd
+++ b/v2_17_0/CDT-locationPolicy-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd b/v2_17_0/CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd
index 00337a214a6309bc64650d7a9297f2212a344729..61eca0c308e39bd7e82f5302146ec2016a943197 100644
--- a/v2_17_0/CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd
+++ b/v2_17_0/CDT-m2mServiceSubscriptionProfile-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_17_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-memory-v2_17_0.xsd b/v2_17_0/CDT-memory-v2_17_0.xsd
index e6feb721c48616a57a81f3be3d15ad3753d06529..099b9f042de3571c71f9c4e2edccc978153a1ddd 100644
--- a/v2_17_0/CDT-memory-v2_17_0.xsd
+++ b/v2_17_0/CDT-memory-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-mgmtCmd-v2_17_0.xsd b/v2_17_0/CDT-mgmtCmd-v2_17_0.xsd
index 3111e1727c731ba11661534ef826fd7a312b2fc5..fc07ab213fa35f3dd382a629d56a359cd64c674d 100644
--- a/v2_17_0/CDT-mgmtCmd-v2_17_0.xsd
+++ b/v2_17_0/CDT-mgmtCmd-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_17_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-node-v2_17_0.xsd b/v2_17_0/CDT-node-v2_17_0.xsd
index 1a236a5b2b9fac489c979efb4fd086591277b1c6..583a0c040c609606377a76f424db601e1d8fafaf 100644
--- a/v2_17_0/CDT-node-v2_17_0.xsd
+++ b/v2_17_0/CDT-node-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_17_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-notification-v2_17_0.xsd b/v2_17_0/CDT-notification-v2_17_0.xsd
index 7bfb30eccf3e0995c8b1accc5ec99dbd6684d7df..c98e9812f065cd7271f1f6df6ae455d23ee026ad 100644
--- a/v2_17_0/CDT-notification-v2_17_0.xsd
+++ b/v2_17_0/CDT-notification-v2_17_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_16_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_16_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_17_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_17_0/CDT-notificationTargetMgmtPolicyRef-v2_17_0.xsd b/v2_17_0/CDT-notificationTargetMgmtPolicyRef-v2_17_0.xsd
index 27005f977b5f25d21cc9a763a25a656935954c65..af6ebac26c29f589f853c3815dd564ca05584e7f 100644
--- a/v2_17_0/CDT-notificationTargetMgmtPolicyRef-v2_17_0.xsd
+++ b/v2_17_0/CDT-notificationTargetMgmtPolicyRef-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-notificationTargetPolicy-v2_17_0.xsd b/v2_17_0/CDT-notificationTargetPolicy-v2_17_0.xsd
index 1b102de5a09f96e671a5a25357a66993b41f4231..0834488d293057eef3514263ff4791f057052935 100644
--- a/v2_17_0/CDT-notificationTargetPolicy-v2_17_0.xsd
+++ b/v2_17_0/CDT-notificationTargetPolicy-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-policyDeletionRules-v2_17_0.xsd b/v2_17_0/CDT-policyDeletionRules-v2_17_0.xsd
index 1907b0afb67c75c0f8fe002f48c429c0f7bf58e7..78d7b4144e2eed7c77229143de3e7304c6e46a4f 100644
--- a/v2_17_0/CDT-policyDeletionRules-v2_17_0.xsd
+++ b/v2_17_0/CDT-policyDeletionRules-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-pollingChannel-v2_17_0.xsd b/v2_17_0/CDT-pollingChannel-v2_17_0.xsd
index 745209cc540078788c8f5aaae4215af3dbc90ddd..d9180d46087b540f31011ad39cb48e801cb0a9e5 100644
--- a/v2_17_0/CDT-pollingChannel-v2_17_0.xsd
+++ b/v2_17_0/CDT-pollingChannel-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-reboot-v2_17_0.xsd b/v2_17_0/CDT-reboot-v2_17_0.xsd
index f9ebdb4cad0696c20bc0e16e088f97c1db69eeca..ebbe7b2fb2224f766a5b92f10815926a6345a3fa 100644
--- a/v2_17_0/CDT-reboot-v2_17_0.xsd
+++ b/v2_17_0/CDT-reboot-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-remoteCSE-v2_17_0.xsd b/v2_17_0/CDT-remoteCSE-v2_17_0.xsd
index 943bbde7422fa017535a8aefe5382c470d7b5ada..66504620865465cf87e6c6b9a7ab9021c211fd95 100644
--- a/v2_17_0/CDT-remoteCSE-v2_17_0.xsd
+++ b/v2_17_0/CDT-remoteCSE-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_17_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-request-v2_17_0.xsd b/v2_17_0/CDT-request-v2_17_0.xsd
index cc1f02084e869d73449f18960cd3c5f1707b3653..197531f9975becabe31c74defbc49655fc4a2363 100644
--- a/v2_17_0/CDT-request-v2_17_0.xsd
+++ b/v2_17_0/CDT-request-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-requestPrimitive-v2_17_0.xsd b/v2_17_0/CDT-requestPrimitive-v2_17_0.xsd
index 541352fdb5c24fd4b93448a6a93997525d04451d..c0fe1b1b6acf584dbd10be92695b576b47ebcfb3 100644
--- a/v2_17_0/CDT-requestPrimitive-v2_17_0.xsd
+++ b/v2_17_0/CDT-requestPrimitive-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_17_0/CDT-responsePrimitive-v2_17_0.xsd b/v2_17_0/CDT-responsePrimitive-v2_17_0.xsd
index 483404b048598e44fd77a4b2913c97a6486f4462..2efdb6b3b02d6101915df9c28fec50903155a48d 100644
--- a/v2_17_0/CDT-responsePrimitive-v2_17_0.xsd
+++ b/v2_17_0/CDT-responsePrimitive-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_17_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_17_0/CDT-role-v2_17_0.xsd b/v2_17_0/CDT-role-v2_17_0.xsd
index 6b1a7da43c6eb1eadf0b0bc9ebee2a058fc0b90a..99fdd38895c5a1be4331ec16d1ec17fac246cee9 100644
--- a/v2_17_0/CDT-role-v2_17_0.xsd
+++ b/v2_17_0/CDT-role-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-schedule-v2_17_0.xsd b/v2_17_0/CDT-schedule-v2_17_0.xsd
index b1bbf7981ec8c54d9b951377d6b7a4651b852912..1547668d91220e1200210a1d2648d77eaf625a0e 100644
--- a/v2_17_0/CDT-schedule-v2_17_0.xsd
+++ b/v2_17_0/CDT-schedule-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-semanticDescriptor-v2_17_0.xsd b/v2_17_0/CDT-semanticDescriptor-v2_17_0.xsd
index 231ef6dcd23ba50ff2b96946fbef7191a06e58fd..b2841353ca3b0893583f41c78619d1547992c1d7 100644
--- a/v2_17_0/CDT-semanticDescriptor-v2_17_0.xsd
+++ b/v2_17_0/CDT-semanticDescriptor-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-serviceSubscribedAppRule-v2_17_0.xsd b/v2_17_0/CDT-serviceSubscribedAppRule-v2_17_0.xsd
index bbb28bece849976478e1e5405c5b770fd678e07e..983a67825e63e36e51506a21ee93b7ad42c60178 100644
--- a/v2_17_0/CDT-serviceSubscribedAppRule-v2_17_0.xsd
+++ b/v2_17_0/CDT-serviceSubscribedAppRule-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-serviceSubscribedNode-v2_17_0.xsd b/v2_17_0/CDT-serviceSubscribedNode-v2_17_0.xsd
index 464f86e94915067aa1f55cfe592d464c188ee23f..e5d17e6c2d36c9008474bafb32da5909f043b67b 100644
--- a/v2_17_0/CDT-serviceSubscribedNode-v2_17_0.xsd
+++ b/v2_17_0/CDT-serviceSubscribedNode-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-software-v2_17_0.xsd b/v2_17_0/CDT-software-v2_17_0.xsd
index b97bc0c187c1f765a6959ca68be4e0783183db2b..db867e8a1b5e46d4f762b2724df7705e4fae06fa 100644
--- a/v2_17_0/CDT-software-v2_17_0.xsd
+++ b/v2_17_0/CDT-software-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-statsCollect-v2_17_0.xsd b/v2_17_0/CDT-statsCollect-v2_17_0.xsd
index 84ab4edac57e765e52724f4fa05d981c473117c4..9963245e23113b6ba21c7750cf5d6726872c6a64 100644
--- a/v2_17_0/CDT-statsCollect-v2_17_0.xsd
+++ b/v2_17_0/CDT-statsCollect-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-statsConfig-v2_17_0.xsd b/v2_17_0/CDT-statsConfig-v2_17_0.xsd
index b5d6b9bb8eb80d9c1e955141aede3be97571e7ef..76dc566d0c135e9983204ef345138afef5dbe771 100644
--- a/v2_17_0/CDT-statsConfig-v2_17_0.xsd
+++ b/v2_17_0/CDT-statsConfig-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-subscription-v2_17_0.xsd b/v2_17_0/CDT-subscription-v2_17_0.xsd
index ce403ad9dd1ba92dea3be8a4a8f7f5e1c16bbfae..9a21922b36cf7fc4419491a9ba25287ee5beb909 100644
--- a/v2_17_0/CDT-subscription-v2_17_0.xsd
+++ b/v2_17_0/CDT-subscription-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_17_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-svcFwWrapper-v2_17_0.xsd b/v2_17_0/CDT-svcFwWrapper-v2_17_0.xsd
index 408675547d9966e72f1aa4ae09bb31b46ae0a3a5..8d337f40b016eef17e8330a37031566004be619f 100644
--- a/v2_17_0/CDT-svcFwWrapper-v2_17_0.xsd
+++ b/v2_17_0/CDT-svcFwWrapper-v2_17_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_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-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-svcObjWrapper-v2_17_0.xsd b/v2_17_0/CDT-svcObjWrapper-v2_17_0.xsd
index 9deb02e303668855d7120ea587b92abaf779753c..f1322e8d9a60926bb5e02223a17d3e869dfce5cd 100644
--- a/v2_17_0/CDT-svcObjWrapper-v2_17_0.xsd
+++ b/v2_17_0/CDT-svcObjWrapper-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_17_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-timeSeries-v2_17_0.xsd b/v2_17_0/CDT-timeSeries-v2_17_0.xsd
index 464ae68c8f6acd83f5ffe96f4cd0d58f3d9a288e..39cd6d5b4c2aae306cf313fd93483340a94370ef 100644
--- a/v2_17_0/CDT-timeSeries-v2_17_0.xsd
+++ b/v2_17_0/CDT-timeSeries-v2_17_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_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:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_17_0/CDT-timeSeriesInstance-v2_17_0.xsd b/v2_17_0/CDT-timeSeriesInstance-v2_17_0.xsd
index 278b3ad66ed5c1a04590c7c6785a03693dbef42f..42c47de7be72eced0873e62c28d797d261fb87f9 100644
--- a/v2_17_0/CDT-timeSeriesInstance-v2_17_0.xsd
+++ b/v2_17_0/CDT-timeSeriesInstance-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-token-v2_17_0.xsd b/v2_17_0/CDT-token-v2_17_0.xsd
index 2b1431fb549b2a63aafc16243ce264f705dcebac..113999f82e7c89527ad9888a557a11f2ca899217 100644
--- a/v2_17_0/CDT-token-v2_17_0.xsd
+++ b/v2_17_0/CDT-token-v2_17_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_16_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_17_0/CDT-trafficPattern-v2_17_0.xsd b/v2_17_0/CDT-trafficPattern-v2_17_0.xsd
index e30782f5f0ef688b79d51b737c457383e3fcd53d..ae20f926402312f243564e56988911392b1b0651 100644
--- a/v2_17_0/CDT-trafficPattern-v2_17_0.xsd
+++ b/v2_17_0/CDT-trafficPattern-v2_17_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_16_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_16_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>