diff --git a/v1_8_0/CDT-AE-v1_8_0.xsd b/v1_8_0/CDT-AE-v1_8_0.xsd
index 76b738fde035264b9fe906d3f8364bf6b0d9c4ee..1054c5ce2f2d93f422c667bd2939874adc881746 100644
--- a/v1_8_0/CDT-AE-v1_8_0.xsd
+++ b/v1_8_0/CDT-AE-v1_8_0.xsd
@@ -26,13 +26,13 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
<xs:element name="AE">
<xs:complexType>
diff --git a/v1_8_0/CDT-CSEBase-v1_8_0.xsd b/v1_8_0/CDT-CSEBase-v1_8_0.xsd
index 667c614aea6b7b978abf78cbfd670203a97c8ed2..202f2e42672855c40a64c3f34f1b42feaeb55bd5 100644
--- a/v1_8_0/CDT-CSEBase-v1_8_0.xsd
+++ b/v1_8_0/CDT-CSEBase-v1_8_0.xsd
@@ -26,23 +26,23 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-request-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_8_0.xsd" />
<xs:element name="CSEBase">
<xs:complexType>
diff --git a/v1_8_0/CDT-accessControlPolicy-v1_8_0.xsd b/v1_8_0/CDT-accessControlPolicy-v1_8_0.xsd
index 7389adfb6b8c92cfaa5ada5b3c19c19826bd45d3..b0418b1216feb34aaab05d4c021731cfc83fdfac 100644
--- a/v1_8_0/CDT-accessControlPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-accessControlPolicy-v1_8_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-v1_7_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd"/>
<xs:element name="accessControlPolicy">
<xs:complexType>
diff --git a/v1_8_0/CDT-activeCmdhPolicy-v1_8_0.xsd b/v1_8_0/CDT-activeCmdhPolicy-v1_8_0.xsd
index cf8e2252992dcee4114d95f5e75d5517a5feb3e1..a409c76cb7e220f80a8feae461a091642ed4e1fc 100644
--- a/v1_8_0/CDT-activeCmdhPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-activeCmdhPolicy-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="activeCmdhPolicy">
<xs:complexType>
diff --git a/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_0.xsd b/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_0.xsd
index bc9e0e1184e0f759ea56725940b1734be104e791..7b0eb26a4ddfe441bf46f263d07f50993b9354c1 100644
--- a/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_0.xsd
+++ b/v1_8_0/CDT-areaNwkDeviceInfo-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="areaNwkDeviceInfo">
<xs:complexType>
diff --git a/v1_8_0/CDT-areaNwkInfo-v1_8_0.xsd b/v1_8_0/CDT-areaNwkInfo-v1_8_0.xsd
index f805291eae0e316446833e511833212598826d11..8e967e50443d7c6e4ec159f2156dcdd1983331cf 100644
--- a/v1_8_0/CDT-areaNwkInfo-v1_8_0.xsd
+++ b/v1_8_0/CDT-areaNwkInfo-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="areaNwkInfo">
<xs:complexType>
diff --git a/v1_8_0/CDT-battery-v1_8_0.xsd b/v1_8_0/CDT-battery-v1_8_0.xsd
index 4873e472f2c4ba5549516424b279bdd9ae4a4072..f4990dd7b4bceeac5543879166df5538100a9b2d 100644
--- a/v1_8_0/CDT-battery-v1_8_0.xsd
+++ b/v1_8_0/CDT-battery-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="battery">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhBuffer-v1_8_0.xsd b/v1_8_0/CDT-cmdhBuffer-v1_8_0.xsd
index c22840b16c11ade7c04050bcbc577015cc6b7001..6d0e9450234ad0e73f5cfbfc473ec99556323cb5 100644
--- a/v1_8_0/CDT-cmdhBuffer-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhBuffer-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhBuffer">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhDefEcValue-v1_8_0.xsd b/v1_8_0/CDT-cmdhDefEcValue-v1_8_0.xsd
index 5bf46688fa0c81e2142b1ba35feec81405ef8bf0..a80458c115f3a5c1622ed1f5ddb0a8f4475d2ddf 100644
--- a/v1_8_0/CDT-cmdhDefEcValue-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhDefEcValue-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhDefEcValue">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhDefaults-v1_8_0.xsd b/v1_8_0/CDT-cmdhDefaults-v1_8_0.xsd
index 7632e27847a3a51c6e313e2376066bd25b4ac4bb..b1e440fb9c5dbd93def17aeb4e946dab76c81c33 100644
--- a/v1_8_0/CDT-cmdhDefaults-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhDefaults-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhDefaults">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_0.xsd b/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_0.xsd
index 22cd6fa729dfa16907f256a3c879279410236718..3365c60ff312691af9290cd58e5a6c07063a3377 100644
--- a/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhEcDefParamValues-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhEcDefParamValues">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhLimits-v1_8_0.xsd b/v1_8_0/CDT-cmdhLimits-v1_8_0.xsd
index 17c12ffc71ea650fc6691e8bb98899ca8f413f2a..5525b6ed9eea858093b2bbe71284da52762702dc 100644
--- a/v1_8_0/CDT-cmdhLimits-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhLimits-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhLimits">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_0.xsd b/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_0.xsd
index 45a46d2872a7069d35a4f7671e408f06d80cbf48..edf4c3daea41c34ed00a5656cadc0c651de03276 100644
--- a/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhNetworkAccessRules-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhNetworkAccessRules">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhNwAccessRule-v1_8_0.xsd b/v1_8_0/CDT-cmdhNwAccessRule-v1_8_0.xsd
index 5ba3621a1644bfa9574ef1d7d5dfb0bd3224f579..f5c7aa5460cbb1547b848d31d7d808362beb06e4 100644
--- a/v1_8_0/CDT-cmdhNwAccessRule-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhNwAccessRule-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhNwAccessRule">
<xs:complexType>
diff --git a/v1_8_0/CDT-cmdhPolicy-v1_8_0.xsd b/v1_8_0/CDT-cmdhPolicy-v1_8_0.xsd
index 285e682047c36b33980a34c7d58b3df4f7cf1a71..397b03e235fe0fe66065433757276d301532f293 100644
--- a/v1_8_0/CDT-cmdhPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-cmdhPolicy-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="cmdhPolicy" >
<xs:complexType>
diff --git a/v1_8_0/CDT-commonTypes-v1_8_0.xsd b/v1_8_0/CDT-commonTypes-v1_8_0.xsd
index 2a13950a104be127e7685b125917cbbed78eaa4e..0c3b22385c7a24e552c4157e362b6169f2e486d3 100644
--- a/v1_8_0/CDT-commonTypes-v1_8_0.xsd
+++ b/v1_8_0/CDT-commonTypes-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v1_8_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v1_8_0/CDT-container-v1_8_0.xsd b/v1_8_0/CDT-container-v1_8_0.xsd
index cc4dd1ed7f91b29341ad6855667713ba6d2b5fe0..1c233faedfa4835cb6d8c7a694951a3256ef7ddf 100644
--- a/v1_8_0/CDT-container-v1_8_0.xsd
+++ b/v1_8_0/CDT-container-v1_8_0.xsd
@@ -26,9 +26,9 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="container">
<xs:complexType>
diff --git a/v1_8_0/CDT-contentInstance-v1_8_0.xsd b/v1_8_0/CDT-contentInstance-v1_8_0.xsd
index 744aa03ff25dad18f22da4d0b513fb68100a8c7d..ada2aecc8f3954cb0ebd291a0859b78c24ac33d4 100644
--- a/v1_8_0/CDT-contentInstance-v1_8_0.xsd
+++ b/v1_8_0/CDT-contentInstance-v1_8_0.xsd
@@ -27,7 +27,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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="contentInstance">
<xs:complexType>
diff --git a/v1_8_0/CDT-delivery-v1_8_0.xsd b/v1_8_0/CDT-delivery-v1_8_0.xsd
index d4e851ec64ddf499fad7dcea97fb0aa4950202fc..aa860f0d2982060bd3e6f6e6b647afbfe1944296 100644
--- a/v1_8_0/CDT-delivery-v1_8_0.xsd
+++ b/v1_8_0/CDT-delivery-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="delivery">
diff --git a/v1_8_0/CDT-deviceCapability-v1_8_0.xsd b/v1_8_0/CDT-deviceCapability-v1_8_0.xsd
index bbd5c659a0c442c571d7d2c96ed9ee9ad194700e..ec9970b42bc743e27cad21bfa9c4f92f0e52560e 100644
--- a/v1_8_0/CDT-deviceCapability-v1_8_0.xsd
+++ b/v1_8_0/CDT-deviceCapability-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="deviceCapability">
<xs:complexType>
diff --git a/v1_8_0/CDT-deviceInfo-v1_8_0.xsd b/v1_8_0/CDT-deviceInfo-v1_8_0.xsd
index 40bb767d5c1c4d9acb9d8a7641930f63a3d5ebd5..75598e0d74ddfe8e85035cf17912a1ffcc6d9acb 100644
--- a/v1_8_0/CDT-deviceInfo-v1_8_0.xsd
+++ b/v1_8_0/CDT-deviceInfo-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="deviceInfo">
<xs:complexType>
diff --git a/v1_8_0/CDT-eventConfig-v1_8_0.xsd b/v1_8_0/CDT-eventConfig-v1_8_0.xsd
index 79ec3aa84e91f167e9a690abbdee69d573e60825..513433408265cb8130855fda3e276aa77ea49d72 100644
--- a/v1_8_0/CDT-eventConfig-v1_8_0.xsd
+++ b/v1_8_0/CDT-eventConfig-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="eventConfig">
<xs:complexType>
diff --git a/v1_8_0/CDT-eventLog-v1_8_0.xsd b/v1_8_0/CDT-eventLog-v1_8_0.xsd
index e1be4e4f0f967ae54dcb80cdcb9b589aafff8862..c1d03078922e035b71b88f455745b9c6a69c6141 100644
--- a/v1_8_0/CDT-eventLog-v1_8_0.xsd
+++ b/v1_8_0/CDT-eventLog-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="eventLog">
<xs:complexType>
diff --git a/v1_8_0/CDT-execInstance-v1_8_0.xsd b/v1_8_0/CDT-execInstance-v1_8_0.xsd
index 546fdd7beb865cdcc1be2bd6e5f1d0a38ef5ea80..a336be84c26f78cbda7b03352847b002bda0fbc7 100644
--- a/v1_8_0/CDT-execInstance-v1_8_0.xsd
+++ b/v1_8_0/CDT-execInstance-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="execInstance">
<xs:complexType>
diff --git a/v1_8_0/CDT-firmware-v1_8_0.xsd b/v1_8_0/CDT-firmware-v1_8_0.xsd
index 5b5e1c25ae8bc566078580bf200556fee23dab90..03a23aba0b38cf797ae9240185f6ae15bfcfe97b 100644
--- a/v1_8_0/CDT-firmware-v1_8_0.xsd
+++ b/v1_8_0/CDT-firmware-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="firmware">
<xs:complexType>
diff --git a/v1_8_0/CDT-group-v1_8_0.xsd b/v1_8_0/CDT-group-v1_8_0.xsd
index cb50c47eb9b0229c7806ff034f10a668b5aacc24..88b38c0086e1bc99e0e30eef92aac926282fe710 100644
--- a/v1_8_0/CDT-group-v1_8_0.xsd
+++ b/v1_8_0/CDT-group-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="group">
<xs:complexType>
diff --git a/v1_8_0/CDT-locationPolicy-v1_8_0.xsd b/v1_8_0/CDT-locationPolicy-v1_8_0.xsd
index 49c99219108e283e6ee629850d7560fc28f38f78..e34a652479e9a89a60260ae3eca303df54ef6d11 100644
--- a/v1_8_0/CDT-locationPolicy-v1_8_0.xsd
+++ b/v1_8_0/CDT-locationPolicy-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="locationPolicy">
<xs:complexType>
diff --git a/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd b/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd
index 58c8e21fe63279be1a1bc51b1b8acd2cb6b62eeb..fb45f6354db7c47a1e05db6cc514102f646e2da3 100644
--- a/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd
+++ b/v1_8_0/CDT-m2mServiceSubscriptionProfile-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_8_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile">
<xs:complexType>
diff --git a/v1_8_0/CDT-memory-v1_8_0.xsd b/v1_8_0/CDT-memory-v1_8_0.xsd
index ec1760234d92ac1477784d03041ea400d2c79d63..51129282e4af786db0d3a372e2f375bdd7e37bee 100644
--- a/v1_8_0/CDT-memory-v1_8_0.xsd
+++ b/v1_8_0/CDT-memory-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="memory">
<xs:complexType>
diff --git a/v1_8_0/CDT-mgmtCmd-v1_8_0.xsd b/v1_8_0/CDT-mgmtCmd-v1_8_0.xsd
index 786f5606b3246e0a68027792c3e7b59281323774..9b09e805e1fc5b36f94bc2f43531f234166bb9fd 100644
--- a/v1_8_0/CDT-mgmtCmd-v1_8_0.xsd
+++ b/v1_8_0/CDT-mgmtCmd-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v1_8_0.xsd" />
<xs:element name="mgmtCmd">
<xs:complexType>
diff --git a/v1_8_0/CDT-node-v1_8_0.xsd b/v1_8_0/CDT-node-v1_8_0.xsd
index a463e5d9f4b374c91440be81c250daa130cbd33a..8c322e9fa5e930b013792d5539a589e923a26930 100644
--- a/v1_8_0/CDT-node-v1_8_0.xsd
+++ b/v1_8_0/CDT-node-v1_8_0.xsd
@@ -27,20 +27,20 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-software-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="node">
<xs:complexType>
diff --git a/v1_8_0/CDT-notification-v1_8_0.xsd b/v1_8_0/CDT-notification-v1_8_0.xsd
index 4307296372c690104018f6a55145d7dceb4fe1bf..d63600e9d897d530e84d37a48c766260f525d0d9 100644
--- a/v1_8_0/CDT-notification-v1_8_0.xsd
+++ b/v1_8_0/CDT-notification-v1_8_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-v1_7_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v1_8_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v1_8_0/CDT-pollingChannel-v1_8_0.xsd b/v1_8_0/CDT-pollingChannel-v1_8_0.xsd
index fc8c4588b479698be5e048d555dbc56e8c662505..4553779a6a42fa27dc61fda3e9709f03b3bc99b7 100644
--- a/v1_8_0/CDT-pollingChannel-v1_8_0.xsd
+++ b/v1_8_0/CDT-pollingChannel-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="pollingChannel">
<xs:complexType>
diff --git a/v1_8_0/CDT-reboot-v1_8_0.xsd b/v1_8_0/CDT-reboot-v1_8_0.xsd
index fbc828fbc79c98295bc5ade3babceb048973ff8d..590cc61a40c2c05c834d8b6882eb215315c64db7 100644
--- a/v1_8_0/CDT-reboot-v1_8_0.xsd
+++ b/v1_8_0/CDT-reboot-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="reboot">
<xs:complexType>
diff --git a/v1_8_0/CDT-remoteCSE-v1_8_0.xsd b/v1_8_0/CDT-remoteCSE-v1_8_0.xsd
index 6b46c04faad8493cf59aeed76f68387b6fdc9512..e00fc32c729058e11c4af6be4d5f69f5784452b8 100644
--- a/v1_8_0/CDT-remoteCSE-v1_8_0.xsd
+++ b/v1_8_0/CDT-remoteCSE-v1_8_0.xsd
@@ -26,15 +26,15 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
diff --git a/v1_8_0/CDT-request-v1_8_0.xsd b/v1_8_0/CDT-request-v1_8_0.xsd
index eda24d9d25cfe00a8ab8d649f6129a5dac0b7eab..2ca766937a93dd44e384bab5cb54f9b1235a70e2 100644
--- a/v1_8_0/CDT-request-v1_8_0.xsd
+++ b/v1_8_0/CDT-request-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="request">
<xs:complexType>
diff --git a/v1_8_0/CDT-requestPrimitive-v1_8_0.xsd b/v1_8_0/CDT-requestPrimitive-v1_8_0.xsd
index 41056248b5114d5dfc736d0d55140325d26da5f4..300b908ac786ed26f4205ceebabe4abe9494ba84 100644
--- a/v1_8_0/CDT-requestPrimitive-v1_8_0.xsd
+++ b/v1_8_0/CDT-requestPrimitive-v1_8_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-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd b/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd
index a9bcb785f3dafde6e699c16db0e76630090c5dd6..765add714c68dd4150e8d93c34f558c5983ea6f5 100644
--- a/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd
+++ b/v1_8_0/CDT-responsePrimitive-v1_8_0.xsd
@@ -28,51 +28,51 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-node-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-request-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-software-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v1_8_0/CDT-schedule-v1_8_0.xsd b/v1_8_0/CDT-schedule-v1_8_0.xsd
index 6c2088094a46baf034fe92b34770af216f88613d..0afe8b4412d401b152010e2995369b4eb20337f2 100644
--- a/v1_8_0/CDT-schedule-v1_8_0.xsd
+++ b/v1_8_0/CDT-schedule-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="schedule">
<xs:complexType>
diff --git a/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_0.xsd b/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_0.xsd
index f53d58869e8334d79f790a1ebc9afe6744592c36..3d749ec842761e2d33bffea1287db9d4af3adbbb 100644
--- a/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_0.xsd
+++ b/v1_8_0/CDT-serviceSubscribedAppRule-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="serviceSubscribedAppRule">
<xs:complexType>
diff --git a/v1_8_0/CDT-serviceSubscribedNode-v1_8_0.xsd b/v1_8_0/CDT-serviceSubscribedNode-v1_8_0.xsd
index da3972079feb28ff9e0b3bb17ac030fd9b220aee..a3313b5d3275032b3d1b039b29d613b1e9ef5423 100644
--- a/v1_8_0/CDT-serviceSubscribedNode-v1_8_0.xsd
+++ b/v1_8_0/CDT-serviceSubscribedNode-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="serviceSubscribedNode">
<xs:complexType>
diff --git a/v1_8_0/CDT-software-v1_8_0.xsd b/v1_8_0/CDT-software-v1_8_0.xsd
index 6eb760e66bd544ab6932b08bc73d3f217be3551a..b7ffefac15838f0642633e59979d15249f55b605 100644
--- a/v1_8_0/CDT-software-v1_8_0.xsd
+++ b/v1_8_0/CDT-software-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="software">
<xs:complexType>
diff --git a/v1_8_0/CDT-statsCollect-v1_8_0.xsd b/v1_8_0/CDT-statsCollect-v1_8_0.xsd
index 4461fa617490b8d21c776f5433ead4225cac3663..375ffecb22a21a936fa1d37c14b9e91bb72991b2 100644
--- a/v1_8_0/CDT-statsCollect-v1_8_0.xsd
+++ b/v1_8_0/CDT-statsCollect-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="statsCollect">
<xs:complexType>
diff --git a/v1_8_0/CDT-statsConfig-v1_8_0.xsd b/v1_8_0/CDT-statsConfig-v1_8_0.xsd
index 5481b5497c994eb672d137bebde1c7cfaf174488..c1b9b90812ebdaec8f60d09771df9426b8718948 100644
--- a/v1_8_0/CDT-statsConfig-v1_8_0.xsd
+++ b/v1_8_0/CDT-statsConfig-v1_8_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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_8_0.xsd" />
<xs:element name="statsConfig">
<xs:complexType>
diff --git a/v1_8_0/CDT-subscription-v1_8_0.xsd b/v1_8_0/CDT-subscription-v1_8_0.xsd
index 2fc1c490cfad63b00b83cfaa66356be5c8786383..39f1546d99ddd7cb030ff0c59d2af4a1f4a182da 100644
--- a/v1_8_0/CDT-subscription-v1_8_0.xsd
+++ b/v1_8_0/CDT-subscription-v1_8_0.xsd
@@ -27,8 +27,8 @@ 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-v1_7_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_7_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_8_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_8_0.xsd" />
<xs:element name="subscription">
<xs:complexType>