From 18b992c6ae8e88e4d287c1eb77915e87916e31c1 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Tue, 31 Jul 2018 14:20:09 +0200
Subject: [PATCH] updated schemaLocation attribute values
---
v2_18_0/CDT-AE-v2_18_0.xsd | 20 ++--
v2_18_0/CDT-CSEBase-v2_18_0.xsd | 40 ++++----
v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd | 4 +-
v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd | 2 +-
v2_18_0/CDT-allJoynApp-v2_18_0.xsd | 8 +-
v2_18_0/CDT-allJoynInterface-v2_18_0.xsd | 12 +--
v2_18_0/CDT-allJoynMethod-v2_18_0.xsd | 8 +-
v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd | 6 +-
v2_18_0/CDT-allJoynProperty-v2_18_0.xsd | 6 +-
v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd | 8 +-
v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd | 4 +-
v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd | 4 +-
v2_18_0/CDT-battery-v2_18_0.xsd | 4 +-
v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd | 2 +-
v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd | 2 +-
v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd | 2 +-
v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd | 2 +-
v2_18_0/CDT-cmdhLimits-v2_18_0.xsd | 2 +-
.../CDT-cmdhNetworkAccessRules-v2_18_0.xsd | 2 +-
v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd | 2 +-
v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd | 2 +-
v2_18_0/CDT-commonTypes-v2_18_0.xsd | 2 +-
v2_18_0/CDT-container-v2_18_0.xsd | 8 +-
v2_18_0/CDT-contentInstance-v2_18_0.xsd | 4 +-
v2_18_0/CDT-delivery-v2_18_0.xsd | 4 +-
v2_18_0/CDT-deviceCapability-v2_18_0.xsd | 4 +-
v2_18_0/CDT-deviceInfo-v2_18_0.xsd | 4 +-
...namicAuthorizationConsultation-v2_18_0.xsd | 2 +-
v2_18_0/CDT-eventConfig-v2_18_0.xsd | 4 +-
v2_18_0/CDT-eventLog-v2_18_0.xsd | 4 +-
v2_18_0/CDT-execInstance-v2_18_0.xsd | 4 +-
v2_18_0/CDT-firmware-v2_18_0.xsd | 4 +-
...cInterworkingOperationInstance-v2_18_0.xsd | 6 +-
...CDT-genericInterworkingService-v2_18_0.xsd | 8 +-
v2_18_0/CDT-group-v2_18_0.xsd | 6 +-
v2_18_0/CDT-locationPolicy-v2_18_0.xsd | 4 +-
...-m2mServiceSubscriptionProfile-v2_18_0.xsd | 6 +-
v2_18_0/CDT-memory-v2_18_0.xsd | 4 +-
v2_18_0/CDT-mgmtCmd-v2_18_0.xsd | 6 +-
v2_18_0/CDT-node-v2_18_0.xsd | 32 +++---
v2_18_0/CDT-notification-v2_18_0.xsd | 4 +-
...otificationTargetMgmtPolicyRef-v2_18_0.xsd | 4 +-
.../CDT-notificationTargetPolicy-v2_18_0.xsd | 6 +-
v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd | 4 +-
v2_18_0/CDT-pollingChannel-v2_18_0.xsd | 4 +-
v2_18_0/CDT-reboot-v2_18_0.xsd | 4 +-
v2_18_0/CDT-remoteCSE-v2_18_0.xsd | 22 ++---
v2_18_0/CDT-request-v2_18_0.xsd | 4 +-
v2_18_0/CDT-requestPrimitive-v2_18_0.xsd | 2 +-
v2_18_0/CDT-responsePrimitive-v2_18_0.xsd | 98 +++++++++----------
v2_18_0/CDT-role-v2_18_0.xsd | 2 +-
v2_18_0/CDT-schedule-v2_18_0.xsd | 4 +-
v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd | 4 +-
.../CDT-serviceSubscribedAppRule-v2_18_0.xsd | 4 +-
v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd | 4 +-
v2_18_0/CDT-software-v2_18_0.xsd | 4 +-
v2_18_0/CDT-statsCollect-v2_18_0.xsd | 4 +-
v2_18_0/CDT-statsConfig-v2_18_0.xsd | 6 +-
v2_18_0/CDT-subscription-v2_18_0.xsd | 6 +-
v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd | 6 +-
v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd | 8 +-
v2_18_0/CDT-timeSeries-v2_18_0.xsd | 8 +-
v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd | 2 +-
v2_18_0/CDT-token-v2_18_0.xsd | 2 +-
v2_18_0/CDT-trafficPattern-v2_18_0.xsd | 6 +-
65 files changed, 240 insertions(+), 240 deletions(-)
diff --git a/v2_18_0/CDT-AE-v2_18_0.xsd b/v2_18_0/CDT-AE-v2_18_0.xsd
index aefe07f..f3de8d5 100644
--- a/v2_18_0/CDT-AE-v2_18_0.xsd
+++ b/v2_18_0/CDT-AE-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_18_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-CSEBase-v2_18_0.xsd b/v2_18_0/CDT-CSEBase-v2_18_0.xsd
index e347435..9e20555 100644
--- a/v2_18_0/CDT-CSEBase-v2_18_0.xsd
+++ b/v2_18_0/CDT-CSEBase-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_18_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd b/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd
index ea887d4..35fb346 100644
--- a/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-accessControlPolicy-v2_18_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_17_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd b/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd
index e769679..f4e1afa 100644
--- a/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-activeCmdhPolicy-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynApp-v2_18_0.xsd b/v2_18_0/CDT-allJoynApp-v2_18_0.xsd
index 3e2bed5..7579d49 100644
--- a/v2_18_0/CDT-allJoynApp-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynApp-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_18_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd b/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd
index 1cdeef9..eaf0004 100644
--- a/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynInterface-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd b/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd
index c7f322c..9ca7235 100644
--- a/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynMethod-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_18_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd b/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd
index 8bed5c1..09c37a4 100644
--- a/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynMethodCall-v2_18_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_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-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd b/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd
index f798a37..8998d23 100644
--- a/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynProperty-v2_18_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_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-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd b/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd
index c07b688..2c3ad1a 100644
--- a/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynSvcObject-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_18_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd b/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd
index 715fe0b..310308d 100644
--- a/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd
+++ b/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd b/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd
index 765472e..0453fef 100644
--- a/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd
+++ b/v2_18_0/CDT-areaNwkInfo-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-battery-v2_18_0.xsd b/v2_18_0/CDT-battery-v2_18_0.xsd
index 8352fa2..dd4850b 100644
--- a/v2_18_0/CDT-battery-v2_18_0.xsd
+++ b/v2_18_0/CDT-battery-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd b/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd
index 8d3c584..c12287c 100644
--- a/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhBuffer-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd b/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd
index da40e96..d7fb4a8 100644
--- a/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhDefEcValue-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd b/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd
index 68da392..37b1772 100644
--- a/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhDefaults-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd b/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd
index c604ef9..d053c1f 100644
--- a/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd b/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd
index 9401b68..0ac6b01 100644
--- a/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhLimits-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd b/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd
index cd3f2d7..46f50c5 100644
--- a/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd b/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd
index 5bc573b..21eb1d6 100644
--- a/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhNwAccessRule-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd b/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd
index b30ec53..d6d1a7e 100644
--- a/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhPolicy-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-commonTypes-v2_18_0.xsd b/v2_18_0/CDT-commonTypes-v2_18_0.xsd
index 7691caa..8535ba4 100644
--- a/v2_18_0/CDT-commonTypes-v2_18_0.xsd
+++ b/v2_18_0/CDT-commonTypes-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_18_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_18_0/CDT-container-v2_18_0.xsd b/v2_18_0/CDT-container-v2_18_0.xsd
index f9581dc..ae686de 100644
--- a/v2_18_0/CDT-container-v2_18_0.xsd
+++ b/v2_18_0/CDT-container-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_18_0/CDT-contentInstance-v2_18_0.xsd b/v2_18_0/CDT-contentInstance-v2_18_0.xsd
index a7818db..90ce381 100644
--- a/v2_18_0/CDT-contentInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-contentInstance-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-delivery-v2_18_0.xsd b/v2_18_0/CDT-delivery-v2_18_0.xsd
index a4469db..6e55e5b 100644
--- a/v2_18_0/CDT-delivery-v2_18_0.xsd
+++ b/v2_18_0/CDT-delivery-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_18_0/CDT-deviceCapability-v2_18_0.xsd b/v2_18_0/CDT-deviceCapability-v2_18_0.xsd
index c67dd18..f4172c3 100644
--- a/v2_18_0/CDT-deviceCapability-v2_18_0.xsd
+++ b/v2_18_0/CDT-deviceCapability-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-deviceInfo-v2_18_0.xsd b/v2_18_0/CDT-deviceInfo-v2_18_0.xsd
index bbc4ffa..771c02d 100644
--- a/v2_18_0/CDT-deviceInfo-v2_18_0.xsd
+++ b/v2_18_0/CDT-deviceInfo-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd b/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd
index f1fd8c7..e516826 100644
--- a/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd
+++ b/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-eventConfig-v2_18_0.xsd b/v2_18_0/CDT-eventConfig-v2_18_0.xsd
index a67ef7a..7ca6a83 100644
--- a/v2_18_0/CDT-eventConfig-v2_18_0.xsd
+++ b/v2_18_0/CDT-eventConfig-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-eventLog-v2_18_0.xsd b/v2_18_0/CDT-eventLog-v2_18_0.xsd
index ce16a9a..a3868a9 100644
--- a/v2_18_0/CDT-eventLog-v2_18_0.xsd
+++ b/v2_18_0/CDT-eventLog-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-execInstance-v2_18_0.xsd b/v2_18_0/CDT-execInstance-v2_18_0.xsd
index 3328892..531bf63 100644
--- a/v2_18_0/CDT-execInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-execInstance-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-firmware-v2_18_0.xsd b/v2_18_0/CDT-firmware-v2_18_0.xsd
index a6c26ee..c340433 100644
--- a/v2_18_0/CDT-firmware-v2_18_0.xsd
+++ b/v2_18_0/CDT-firmware-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd b/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd
index d2ab11e..e0a12ce 100644
--- a/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_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_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-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd b/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd
index 377235f..a7e8cbb 100644
--- a/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd
+++ b/v2_18_0/CDT-genericInterworkingService-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_18_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-group-v2_18_0.xsd b/v2_18_0/CDT-group-v2_18_0.xsd
index 82ae4a7..6f8f501 100644
--- a/v2_18_0/CDT-group-v2_18_0.xsd
+++ b/v2_18_0/CDT-group-v2_18_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_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-commonTypes-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-locationPolicy-v2_18_0.xsd b/v2_18_0/CDT-locationPolicy-v2_18_0.xsd
index b7f6db0..c7f16b3 100644
--- a/v2_18_0/CDT-locationPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-locationPolicy-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd b/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd
index 61eca0c..46e58a1 100644
--- a/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd
+++ b/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_18_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-memory-v2_18_0.xsd b/v2_18_0/CDT-memory-v2_18_0.xsd
index 099b9f0..700c660 100644
--- a/v2_18_0/CDT-memory-v2_18_0.xsd
+++ b/v2_18_0/CDT-memory-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd b/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd
index fc07ab2..6544159 100644
--- a/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd
+++ b/v2_18_0/CDT-mgmtCmd-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_18_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-node-v2_18_0.xsd b/v2_18_0/CDT-node-v2_18_0.xsd
index 583a0c0..be5d952 100644
--- a/v2_18_0/CDT-node-v2_18_0.xsd
+++ b/v2_18_0/CDT-node-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_18_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-notification-v2_18_0.xsd b/v2_18_0/CDT-notification-v2_18_0.xsd
index c98e981..67e4ed2 100644
--- a/v2_18_0/CDT-notification-v2_18_0.xsd
+++ b/v2_18_0/CDT-notification-v2_18_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_17_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_18_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd b/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd
index af6ebac..624f964 100644
--- a/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd
+++ b/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd b/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd
index 0834488..755b343 100644
--- a/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-notificationTargetPolicy-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd b/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd
index 78d7b41..fe58a38 100644
--- a/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd
+++ b/v2_18_0/CDT-policyDeletionRules-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-pollingChannel-v2_18_0.xsd b/v2_18_0/CDT-pollingChannel-v2_18_0.xsd
index d9180d4..b7b0c50 100644
--- a/v2_18_0/CDT-pollingChannel-v2_18_0.xsd
+++ b/v2_18_0/CDT-pollingChannel-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-reboot-v2_18_0.xsd b/v2_18_0/CDT-reboot-v2_18_0.xsd
index ebbe7b2..27ce962 100644
--- a/v2_18_0/CDT-reboot-v2_18_0.xsd
+++ b/v2_18_0/CDT-reboot-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-remoteCSE-v2_18_0.xsd b/v2_18_0/CDT-remoteCSE-v2_18_0.xsd
index 6650462..8a028ec 100644
--- a/v2_18_0/CDT-remoteCSE-v2_18_0.xsd
+++ b/v2_18_0/CDT-remoteCSE-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-request-v2_18_0.xsd b/v2_18_0/CDT-request-v2_18_0.xsd
index 197531f..a9f9781 100644
--- a/v2_18_0/CDT-request-v2_18_0.xsd
+++ b/v2_18_0/CDT-request-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd b/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd
index c0fe1b1..dda8cfa 100644
--- a/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd
+++ b/v2_18_0/CDT-requestPrimitive-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd b/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd
index 0d746e9..e8527c1 100644
--- a/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd
+++ b/v2_18_0/CDT-responsePrimitive-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_18_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_18_0/CDT-role-v2_18_0.xsd b/v2_18_0/CDT-role-v2_18_0.xsd
index 99fdd38..4337f6c 100644
--- a/v2_18_0/CDT-role-v2_18_0.xsd
+++ b/v2_18_0/CDT-role-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-schedule-v2_18_0.xsd b/v2_18_0/CDT-schedule-v2_18_0.xsd
index 1547668..3a8c1fa 100644
--- a/v2_18_0/CDT-schedule-v2_18_0.xsd
+++ b/v2_18_0/CDT-schedule-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd b/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd
index b284135..f54ba5d 100644
--- a/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd
+++ b/v2_18_0/CDT-semanticDescriptor-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd b/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd
index 983a678..c2d71ba 100644
--- a/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd
+++ b/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd b/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd
index e5d17e6..171ce8e 100644
--- a/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd
+++ b/v2_18_0/CDT-serviceSubscribedNode-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-software-v2_18_0.xsd b/v2_18_0/CDT-software-v2_18_0.xsd
index db867e8..ea48bbb 100644
--- a/v2_18_0/CDT-software-v2_18_0.xsd
+++ b/v2_18_0/CDT-software-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-statsCollect-v2_18_0.xsd b/v2_18_0/CDT-statsCollect-v2_18_0.xsd
index e139785..6aa0357 100644
--- a/v2_18_0/CDT-statsCollect-v2_18_0.xsd
+++ b/v2_18_0/CDT-statsCollect-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-statsConfig-v2_18_0.xsd b/v2_18_0/CDT-statsConfig-v2_18_0.xsd
index 76dc566..3083b69 100644
--- a/v2_18_0/CDT-statsConfig-v2_18_0.xsd
+++ b/v2_18_0/CDT-statsConfig-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-subscription-v2_18_0.xsd b/v2_18_0/CDT-subscription-v2_18_0.xsd
index 9a21922..d00b4bf 100644
--- a/v2_18_0/CDT-subscription-v2_18_0.xsd
+++ b/v2_18_0/CDT-subscription-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd b/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd
index 8d337f4..36f6dd7 100644
--- a/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd
+++ b/v2_18_0/CDT-svcFwWrapper-v2_18_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_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-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd b/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd
index f1322e8..23b785a 100644
--- a/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd
+++ b/v2_18_0/CDT-svcObjWrapper-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_18_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-timeSeries-v2_18_0.xsd b/v2_18_0/CDT-timeSeries-v2_18_0.xsd
index 39cd6d5..6b2f3c4 100644
--- a/v2_18_0/CDT-timeSeries-v2_18_0.xsd
+++ b/v2_18_0/CDT-timeSeries-v2_18_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_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:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd b/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd
index 42c47de..1146969 100644
--- a/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-timeSeriesInstance-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-token-v2_18_0.xsd b/v2_18_0/CDT-token-v2_18_0.xsd
index 113999f..188146f 100644
--- a/v2_18_0/CDT-token-v2_18_0.xsd
+++ b/v2_18_0/CDT-token-v2_18_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_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-trafficPattern-v2_18_0.xsd b/v2_18_0/CDT-trafficPattern-v2_18_0.xsd
index ae20f92..9877e7e 100644
--- a/v2_18_0/CDT-trafficPattern-v2_18_0.xsd
+++ b/v2_18_0/CDT-trafficPattern-v2_18_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_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
--
GitLab