From e86154c08e838d67cfde0af97687495dfa79dee1 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Thu, 30 Nov 2017 23:07:59 +0100
Subject: [PATCH] updated schemaLocation attribute values

---
 README.md                                    |  7 +++++++
 v2_2_0/DCFG-MAFClientRegCfg-v2_2_0.xsd       |  6 +++---
 v2_2_0/DCFG-MEFClientRegCfg-v2_2_0.xsd       |  6 +++---
 v2_2_0/DCFG-authenticationProfile-v2_2_0.xsd | 11 +++++------
 v2_2_0/DCFG-dataCollection-v2_2_0.xsd        |  4 ++--
 v2_2_0/DCFG-myCertFileCred-v2_2_0.xsd        |  6 +++---
 v2_2_0/DCFG-registration-v2_2_0.xsd          |  4 ++--
 v2_2_0/DCFG-trustAnchorCred-v2_2_0.xsd       |  6 +++---
 8 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 868c1b1..41de2f9 100644
--- a/README.md
+++ b/README.md
@@ -4,17 +4,24 @@ Field Device Configuration schemas
 This is the repository for developing XML schema for the reource types defined in oneM2M TS-0022
 
 \<authenticationProfile\>
+
 \<dataCollection\>
+
 \<MEFClientRegCfg\>
+
 \<registration\>
+
 \<MAFClientRegCfg\>
+
 \<myCertFileCred\>
+
 \<trustAnchorCred\>
 
 DCFG-commonTypes-vx_y_0.xsd defines data types common to all resource types
 
 Note: The required xsd files CDT-commonTypes-vx_y_0 can be downloaded from 
       https://git.onem2m.org/PRO/XSD.git
+
       The required xsd files SEC-commonTypes-vx_y_0 can be downloaded from 
       https://git.onem2m.org/SEC/MAF-MEF.git
 
diff --git a/v2_2_0/DCFG-MAFClientRegCfg-v2_2_0.xsd b/v2_2_0/DCFG-MAFClientRegCfg-v2_2_0.xsd
index 503f400..cb22339 100644
--- a/v2_2_0/DCFG-MAFClientRegCfg-v2_2_0.xsd
+++ b/v2_2_0/DCFG-MAFClientRegCfg-v2_2_0.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 
 	
 	<xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_2_0/DCFG-MEFClientRegCfg-v2_2_0.xsd b/v2_2_0/DCFG-MEFClientRegCfg-v2_2_0.xsd
index 472dbd0..cf6822a 100644
--- a/v2_2_0/DCFG-MEFClientRegCfg-v2_2_0.xsd
+++ b/v2_2_0/DCFG-MEFClientRegCfg-v2_2_0.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 
 	
 	<xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_2_0/DCFG-authenticationProfile-v2_2_0.xsd b/v2_2_0/DCFG-authenticationProfile-v2_2_0.xsd
index 1e8372b..b5ea2b9 100644
--- a/v2_2_0/DCFG-authenticationProfile-v2_2_0.xsd
+++ b/v2_2_0/DCFG-authenticationProfile-v2_2_0.xsd
@@ -29,11 +29,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
 	<xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
@@ -43,8 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="SUID" type="m2m:suid"/>
-						<xs:element name="TLSCiphersuites" type="dcfg:listOfTLSCiphersuite"
-							minOccurs="0"/>
+						<xs:element name="TLSCiphersuites" type="dcfg:listOfTLSCiphersuite" minOccurs="0"/>
 						<xs:element name="symmKeyID" type="sec:credentialID" minOccurs="0"/>
 						<xs:element name="symmKeyValue" type="xs:base64Binary" minOccurs="0"/>
 						<xs:element name="MAFKeyRegLabels" type="m2m:labels" minOccurs="0"/>
diff --git a/v2_2_0/DCFG-dataCollection-v2_2_0.xsd b/v2_2_0/DCFG-dataCollection-v2_2_0.xsd
index 5d1e91d..dfd0d6f 100644
--- a/v2_2_0/DCFG-dataCollection-v2_2_0.xsd
+++ b/v2_2_0/DCFG-dataCollection-v2_2_0.xsd
@@ -29,8 +29,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 	
 	
 	<xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_2_0/DCFG-myCertFileCred-v2_2_0.xsd b/v2_2_0/DCFG-myCertFileCred-v2_2_0.xsd
index 509a9ab..7a01428 100644
--- a/v2_2_0/DCFG-myCertFileCred-v2_2_0.xsd
+++ b/v2_2_0/DCFG-myCertFileCred-v2_2_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
 	
 	<xs:element name="myCertFileCred" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_2_0/DCFG-registration-v2_2_0.xsd b/v2_2_0/DCFG-registration-v2_2_0.xsd
index 63d5060..fc7ce29 100644
--- a/v2_2_0/DCFG-registration-v2_2_0.xsd
+++ b/v2_2_0/DCFG-registration-v2_2_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:dcfg="http://www.onem2m.org/xml/deviceConfig" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 	
 	
 	<xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/v2_2_0/DCFG-trustAnchorCred-v2_2_0.xsd b/v2_2_0/DCFG-trustAnchorCred-v2_2_0.xsd
index 75046bc..050611f 100644
--- a/v2_2_0/DCFG-trustAnchorCred-v2_2_0.xsd
+++ b/v2_2_0/DCFG-trustAnchorCred-v2_2_0.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 
 	
 	<xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">
-- 
2.18.1