updated schemaLocation attribute values

v3_0_0/CDT-AE-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

v3_0_0/CDT-CSEBase-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_10_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_10_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_0_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_0_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_0_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>

v3_0_0/CDT-accessControlPolicy-v3_0_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_10_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>

v3_0_0/CDT-activeCmdhPolicy-v3_0_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>

v3_0_0/CDT-allJoynApp-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_0_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>

v3_0_0/CDT-allJoynInterface-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">

v3_0_0/CDT-allJoynMethod-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_0_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">

v3_0_0/CDT-allJoynMethodCall-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>

v3_0_0/CDT-allJoynProperty-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>

v3_0_0/CDT-allJoynSvcObject-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_0_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>

v3_0_0/CDT-areaNwkDeviceInfo-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-areaNwkInfo-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-battery-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-cmdhBuffer-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>

v3_0_0/CDT-cmdhDefEcValue-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>

v3_0_0/CDT-cmdhDefaults-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>

v3_0_0/CDT-cmdhEcDefParamValues-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     

v3_0_0/CDT-cmdhLimits-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>

v3_0_0/CDT-cmdhNetworkAccessRules-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>

v3_0_0/CDT-cmdhNwAccessRule-v3_0_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_10_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>

v3_0_0/CDT-cmdhPolicy-v3_0_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>

v3_0_0/CDT-commonTypes-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_0_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->

v3_0_0/CDT-container-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">

v3_0_0/CDT-contentInstance-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>

v3_0_0/CDT-delivery-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">

v3_0_0/CDT-deviceCapability-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-deviceInfo-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-dynamicAuthorizationConsultation-v3_0_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_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-eventConfig-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-eventLog-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-execInstance-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-firmware-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-genericInterworkingOperationInstance-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>

v3_0_0/CDT-genericInterworkingService-v3_0_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_10_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_0_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>

v3_0_0/CDT-group-v3_0_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" 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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

v3_0_0/CDT-locationPolicy-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

v3_0_0/CDT-m2mServiceSubscriptionProfile-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_0_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-memory-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-mgmtCmd-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_0_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-node-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_0_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

v3_0_0/CDT-notification-v3_0_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_10_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_10_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_0_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      

v3_0_0/CDT-notificationTargetMgmtPolicyRef-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-notificationTargetPolicy-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-policyDeletionRules-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-pollingChannel-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>

v3_0_0/CDT-reboot-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

v3_0_0/CDT-remoteCSE-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_10_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_0_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

v3_0_0/CDT-request-v3_0_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_10_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_10_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_0_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

v3_0_0/CDT-requestPrimitive-v3_0_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_10_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_0_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >