updated schemaLocation attribute values

b1c95f4d · Wolfgang Granzow · 2695950e · b1c95f4d · b1c95f4d · b1c95f4d
Commit b1c95f4d authored Apr 17, 2019 by Wolfgang Granzow
20 changed files
--- a/v2_21_0/CDT-notification-v2_21_0.xsd
+++ b/v2_21_0/CDT-notification-v2_21_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_20_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_21_0.xsd"/>


        <xs:element name="notification" type="m2m:notification" />      

--- a/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd
+++ b/v2_21_0/CDT-notificationTargetMgmtPolicyRef-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-notificationTargetPolicy-v2_21_0.xsd
+++ b/v2_21_0/CDT-notificationTargetPolicy-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-policyDeletionRules-v2_21_0.xsd
+++ b/v2_21_0/CDT-policyDeletionRules-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-pollingChannel-v2_21_0.xsd
+++ b/v2_21_0/CDT-pollingChannel-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-reboot-v2_21_0.xsd
+++ b/v2_21_0/CDT-reboot-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-remoteCSE-v2_21_0.xsd
+++ b/v2_21_0/CDT-remoteCSE-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />

 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-request-v2_21_0.xsd
+++ b/v2_21_0/CDT-request-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-requestPrimitive-v2_21_0.xsd
+++ b/v2_21_0/CDT-requestPrimitive-v2_21_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_20_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 

    <xs:element name="requestPrimitive" >
      <xs:complexType>

--- a/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd
+++ b/v2_21_0/CDT-responsePrimitive-v2_21_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
      xmlns:m2m="http://www.onem2m.org/xml/protocols"
      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   

-  <xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_20_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_20_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_21_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_21_0.xsd" />

  <xs:element name="responsePrimitive" >
      <xs:complexType>

--- a/v2_21_0/CDT-role-v2_21_0.xsd
+++ b/v2_21_0/CDT-role-v2_21_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-schedule-v2_21_0.xsd
+++ b/v2_21_0/CDT-schedule-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-semanticDescriptor-v2_21_0.xsd
+++ b/v2_21_0/CDT-semanticDescriptor-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_0.xsd
+++ b/v2_21_0/CDT-serviceSubscribedAppRule-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-serviceSubscribedNode-v2_21_0.xsd
+++ b/v2_21_0/CDT-serviceSubscribedNode-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-software-v2_21_0.xsd
+++ b/v2_21_0/CDT-software-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-statsCollect-v2_21_0.xsd
+++ b/v2_21_0/CDT-statsCollect-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-statsConfig-v2_21_0.xsd
+++ b/v2_21_0/CDT-statsConfig-v2_21_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_20_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />

 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-subscription-v2_21_0.xsd
+++ b/v2_21_0/CDT-subscription-v2_21_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-	<xs:include schemaLocation="CDT-commonTypes-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_21_0.xsd" />

 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>

--- a/v2_21_0/CDT-svcFwWrapper-v2_21_0.xsd
+++ b/v2_21_0/CDT-svcFwWrapper-v2_21_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_20_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_20_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_20_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_21_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_21_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_21_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>