From 478482137484d6101dee5c90bc96c5c77fc067b6 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Fri, 27 Mar 2015 15:43:33 +0100
Subject: [PATCH] v1_1_0 updates (batch 2)

---
 v1_1_0/CDT-AE-v1_1_0.xsd                     | 12 +++----
 v1_1_0/CDT-CSEBase-v1_1_0.xsd                | 34 ++++++++++----------
 v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd       |  2 +-
 v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd      |  4 +--
 v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd            |  4 +--
 v1_1_0/CDT-battery-v1_1_0.xsd                |  4 +--
 v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd             |  2 +-
 v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd         |  2 +-
 v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd           |  2 +-
 v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd   |  2 +-
 v1_1_0/CDT-cmdhLimits-v1_1_0.xsd             |  7 ++--
 v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd |  2 +-
 v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd       |  2 +-
 v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd             |  2 +-
 v1_1_0/CDT-container-v1_1_0.xsd              |  6 ++--
 v1_1_0/CDT-contentInstance-v1_1_0.xsd        |  4 +--
 v1_1_0/CDT-delivery-v1_1_0.xsd               |  4 +--
 v1_1_0/CDT-deviceCapability-v1_1_0.xsd       |  4 +--
 v1_1_0/CDT-deviceInfo-v1_1_0.xsd             |  4 +--
 v1_1_0/CDT-eventConfig-v1_1_0.xsd            |  4 +--
 20 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/v1_1_0/CDT-AE-v1_1_0.xsd b/v1_1_0/CDT-AE-v1_1_0.xsd
index 6ea8a96..ed57d08 100644
--- a/v1_1_0/CDT-AE-v1_1_0.xsd
+++ b/v1_1_0/CDT-AE-v1_1_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-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-commonTypes-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:element name="AE">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-CSEBase-v1_1_0.xsd b/v1_1_0/CDT-CSEBase-v1_1_0.xsd
index 57dd306..71286d6 100644
--- a/v1_1_0/CDT-CSEBase-v1_1_0.xsd
+++ b/v1_1_0/CDT-CSEBase-v1_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_0_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-mgmtCmd-v1_0_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_0_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_1_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-mgmtCmd-v1_1_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_1_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd b/v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd
index a1a86e4..2498167 100644
--- a/v1_1_0/CDT-activeCmdhPolicy-v1_1_0.xsd
+++ b/v1_1_0/CDT-activeCmdhPolicy-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="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd b/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd
index 8588d37..7aace37 100644
--- a/v1_1_0/CDT-areaNwkDeviceInfo-v1_1_0.xsd
+++ b/v1_1_0/CDT-areaNwkDeviceInfo-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" 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="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd b/v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd
index 4026302..24b6219 100644
--- a/v1_1_0/CDT-areaNwkInfo-v1_1_0.xsd
+++ b/v1_1_0/CDT-areaNwkInfo-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" 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="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-battery-v1_1_0.xsd b/v1_1_0/CDT-battery-v1_1_0.xsd
index 811c31a..b99d174 100644
--- a/v1_1_0/CDT-battery-v1_1_0.xsd
+++ b/v1_1_0/CDT-battery-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="battery">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd b/v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd
index e8dca6e..5addd21 100644
--- a/v1_1_0/CDT-cmdhBuffer-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhBuffer-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="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd b/v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd
index ff3316f..8181b5f 100644
--- a/v1_1_0/CDT-cmdhDefEcValue-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhDefEcValue-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="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd b/v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd
index d33728c..896521e 100644
--- a/v1_1_0/CDT-cmdhDefaults-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhDefaults-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="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd b/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd
index 0ff2746..595c7a6 100644
--- a/v1_1_0/CDT-cmdhEcDefParamValues-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhEcDefParamValues-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="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd b/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd
index 24c9b48..3799190 100644
--- a/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhLimits-v1_1_0.xsd
@@ -28,8 +28,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" >   
   
-  <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="cmdhLimits">
     <xs:complexType>
@@ -41,17 +41,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <!-- mgmtObj specialization-specific Attributes -->
             <xs:element name="order" type="xs:positiveInteger" />
             <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <!-- TODO In TS-0004 requestContext is shown as xs:string rather than xs:anyType -->
             <xs:element name="requestContext" type="xs:anyType" />
             <xs:element name="requestContextNotification" type="xs:boolean"  minOccurs="0" />
-            <!-- TODO In TS-0004 requestCharacteristics is shown as xs:string rather than xs:anyType -->
             <xs:element name="requestCharacteristics" type="xs:anyType"  />
             <xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
             <xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
             <xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
             <xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
             <xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
-            <!-- TODO: TS-0004 D.12.5 uses type "m2m:permittedBooleanValues" -->
             <xs:element name="limitsDelAggregation" >
                 <xs:simpleType>
                     <xs:restriction base="xs:token">
diff --git a/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd b/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd
index 5bd8e84..f94e81e 100644
--- a/v1_1_0/CDT-cmdhNetworkAccessRules-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhNetworkAccessRules-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="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd b/v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd
index 1a2079d..e8986a1 100644
--- a/v1_1_0/CDT-cmdhNwAccessRule-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhNwAccessRule-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="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd b/v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd
index 44d46ab..2f86969 100644
--- a/v1_1_0/CDT-cmdhPolicy-v1_1_0.xsd
+++ b/v1_1_0/CDT-cmdhPolicy-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="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_1_0/CDT-container-v1_1_0.xsd b/v1_1_0/CDT-container-v1_1_0.xsd
index 1732e7c..31d46c6 100644
--- a/v1_1_0/CDT-container-v1_1_0.xsd
+++ b/v1_1_0/CDT-container-v1_1_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_0_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-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-contentInstance-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-contentInstance-v1_1_0.xsd b/v1_1_0/CDT-contentInstance-v1_1_0.xsd
index a57f8f5..6d89077 100644
--- a/v1_1_0/CDT-contentInstance-v1_1_0.xsd
+++ b/v1_1_0/CDT-contentInstance-v1_1_0.xsd
@@ -27,9 +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_0_0.xsd" />
-
-
+	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-delivery-v1_1_0.xsd b/v1_1_0/CDT-delivery-v1_1_0.xsd
index ef65a6e..b5abe4a 100644
--- a/v1_1_0/CDT-delivery-v1_1_0.xsd
+++ b/v1_1_0/CDT-delivery-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="delivery">
diff --git a/v1_1_0/CDT-deviceCapability-v1_1_0.xsd b/v1_1_0/CDT-deviceCapability-v1_1_0.xsd
index 0d8d325..bd7f5c4 100644
--- a/v1_1_0/CDT-deviceCapability-v1_1_0.xsd
+++ b/v1_1_0/CDT-deviceCapability-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="deviceCapability">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-deviceInfo-v1_1_0.xsd b/v1_1_0/CDT-deviceInfo-v1_1_0.xsd
index 1f174a4..f93b78a 100644
--- a/v1_1_0/CDT-deviceInfo-v1_1_0.xsd
+++ b/v1_1_0/CDT-deviceInfo-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="deviceInfo">
 		<xs:complexType>
diff --git a/v1_1_0/CDT-eventConfig-v1_1_0.xsd b/v1_1_0/CDT-eventConfig-v1_1_0.xsd
index 3a9abd4..9cc7834 100644
--- a/v1_1_0/CDT-eventConfig-v1_1_0.xsd
+++ b/v1_1_0/CDT-eventConfig-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="eventConfig">
 		<xs:complexType>
-- 
2.18.1