diff --git a/v1_1_0/CDT-eventLog-v1_1_0.xsd b/v1_1_0/CDT-eventLog-v1_1_0.xsd
index 240f58295dd73d8f7f04dee9f2b54052cff0ed18..9dca355798a217a26fad9f33bc6826a7d499e19c 100644
--- a/v1_1_0/CDT-eventLog-v1_1_0.xsd
+++ b/v1_1_0/CDT-eventLog-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="eventLog">
<xs:complexType>
diff --git a/v1_1_0/CDT-execInstance-v1_1_0.xsd b/v1_1_0/CDT-execInstance-v1_1_0.xsd
index 309bab91efbf87f45fa1776e0a6fbf5a05316852..8729a4d19aa1dd10a674d0485331290d8772d141 100644
--- a/v1_1_0/CDT-execInstance-v1_1_0.xsd
+++ b/v1_1_0/CDT-execInstance-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="execInstance">
<xs:complexType>
diff --git a/v1_1_0/CDT-firmware-v1_1_0.xsd b/v1_1_0/CDT-firmware-v1_1_0.xsd
index 8ce8d681c25d38c02c2a8ecfad52ac6addc7fb74..17605ca229bb2675831d9a6befc938ed4cc78975 100644
--- a/v1_1_0/CDT-firmware-v1_1_0.xsd
+++ b/v1_1_0/CDT-firmware-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="firmware">
<xs:complexType>
diff --git a/v1_1_0/CDT-group-v1_1_0.xsd b/v1_1_0/CDT-group-v1_1_0.xsd
index 574b8228e23d74ccb51f14691ddef40a80e2d3cc..bfe4893948eaee4dbf56af6f1b6c241dd0b29324 100644
--- a/v1_1_0/CDT-group-v1_1_0.xsd
+++ b/v1_1_0/CDT-group-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="group">
<xs:complexType>
diff --git a/v1_1_0/CDT-locationPolicy-v1_1_0.xsd b/v1_1_0/CDT-locationPolicy-v1_1_0.xsd
index d35d7728adecdeccd25bfe17c69cf5abac17b518..acafaa1c2a3aa9e2d81a26a0de61c27073dce8c0 100644
--- a/v1_1_0/CDT-locationPolicy-v1_1_0.xsd
+++ b/v1_1_0/CDT-locationPolicy-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="locationPolicy">
<xs:complexType>
diff --git a/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd b/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd
index f8752e1e7b6f73152635ba936ad5ae8edd29ca29..128533183dd3b1a6aa7a769283c3c133d1ff5b07 100644
--- a/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd
+++ b/v1_1_0/CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd
@@ -26,10 +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_0_0.xsd" />
-
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_1_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile">
<xs:complexType>
diff --git a/v1_1_0/CDT-memory-v1_1_0.xsd b/v1_1_0/CDT-memory-v1_1_0.xsd
index ad1a8a8d465a8290b3cb927907d0539214134786..bc584cdff90a7e4b280ac56fd0108515c38ce88d 100644
--- a/v1_1_0/CDT-memory-v1_1_0.xsd
+++ b/v1_1_0/CDT-memory-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="memory">
<xs:complexType>
diff --git a/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd b/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd
index aafb610dd532e8e2cca1d871e4a0c3b8c0283a4d..51a61d1c862f2d927d8c9a7ce88437900b6df4b0 100644
--- a/v1_1_0/CDT-mgmtCmd-v1_1_0.xsd
+++ b/v1_1_0/CDT-mgmtCmd-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v1_1_0.xsd" />
<xs:element name="mgmtCmd">
<xs:complexType>
diff --git a/v1_1_0/CDT-node-v1_1_0.xsd b/v1_1_0/CDT-node-v1_1_0.xsd
index a7d104309dc5d9da053cf859d2e645a4dbd061ad..f607d87d96a2193357abee267771c4e34b275093 100644
--- a/v1_1_0/CDT-node-v1_1_0.xsd
+++ b/v1_1_0/CDT-node-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-software-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="node">
<xs:complexType>
diff --git a/v1_1_0/CDT-notification-v1_1_0.xsd b/v1_1_0/CDT-notification-v1_1_0.xsd
index f3cc4578ca6a053fb2bd522d40b9eda1ad7f210b..0d0b46c7c39879a9f3265555c9d4926a4f7aeefd 100644
--- a/v1_1_0/CDT-notification-v1_1_0.xsd
+++ b/v1_1_0/CDT-notification-v1_1_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_0_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v1_0_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v1_1_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v1_1_0/CDT-pollingChannel-v1_1_0.xsd b/v1_1_0/CDT-pollingChannel-v1_1_0.xsd
index 6fb3d668f344f374811701c7047ef090644a0926..adf654053b9d8caf8e1cd6a134300f6ea6ada34b 100644
--- a/v1_1_0/CDT-pollingChannel-v1_1_0.xsd
+++ b/v1_1_0/CDT-pollingChannel-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="pollingChannel">
<xs:complexType>
diff --git a/v1_1_0/CDT-reboot-v1_1_0.xsd b/v1_1_0/CDT-reboot-v1_1_0.xsd
index e8e58542f9209255ad8a8c3d8bffa662976f30e1..e1adbb10845b6ee687df09eed24f7c1d42d0830b 100644
--- a/v1_1_0/CDT-reboot-v1_1_0.xsd
+++ b/v1_1_0/CDT-reboot-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="reboot">
<xs:complexType>
diff --git a/v1_1_0/CDT-remoteCSE-v1_1_0.xsd b/v1_1_0/CDT-remoteCSE-v1_1_0.xsd
index bced1c294faf1d14a1837683499e83954efa33b3..e8c5809fabf931ed6870dd9ba8b643084d5e9dc1 100644
--- a/v1_1_0/CDT-remoteCSE-v1_1_0.xsd
+++ b/v1_1_0/CDT-remoteCSE-v1_1_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-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
diff --git a/v1_1_0/CDT-request-v1_1_0.xsd b/v1_1_0/CDT-request-v1_1_0.xsd
index 5156d7f41531ef608fee9c0fdaacdcc1a47915f9..fc9448c93d699a776f2cc8689b09f7b836201b8d 100644
--- a/v1_1_0/CDT-request-v1_1_0.xsd
+++ b/v1_1_0/CDT-request-v1_1_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_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
<xs:element name="request">
<xs:complexType>
diff --git a/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd b/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd
index b2bf4e38b72009776dff1ddb0e8b1d8e37158498..7c273c2849aac60212c44d1f7716be5f9bed9841 100644
--- a/v1_1_0/CDT-requestPrimitive-v1_1_0.xsd
+++ b/v1_1_0/CDT-requestPrimitive-v1_1_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_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
@@ -56,7 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Operation Execution Time" -->
<xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Response Type" -->
- <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
+ <xs:element name="responseType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Result Persistence" -->
<xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/>
<!-- parameter "Result Content" -->
diff --git a/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd b/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd
index 6f78e01bc43f4e50a5ac3eb0394661c97640cc92..40307ced7523725f73d9d75be80db06affdfa3e9 100644
--- a/v1_1_0/CDT-responsePrimitive-v1_1_0.xsd
+++ b/v1_1_0/CDT-responsePrimitive-v1_1_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_0_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>