Remove version number from filenames and new references to namespaces

DCFG-MAFClientRegCfg.xsd

@@ -23,17 +23,17 @@ 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/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 	
 	
 	<xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">

DCFG-MEFClientRegCfg.xsd

@@ -23,17 +23,17 @@ 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/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 
 	
 	<xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">

DCFG-authenticationProfile.xsd

@@ -22,18 +22,18 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" 
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
+	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" schemaLocation="SEC-commonTypes.xsd" />
 	
 	<xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>

DCFG-commonTypes.xsd

@@ -23,11 +23,11 @@ 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/deviceConfig"
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<!-- <xs:include schemaLocation="CDT-enumerationTypes-v2_16_0.xsd" />  -->
+	<!-- <xs:include schemaLocation="CDT-enumerationTypes" />  -->
 
 	<!--********************** -->
 	<!-- Simple Types   -->

DCFG-dataCollection.xsd

@@ -23,14 +23,14 @@ 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/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" 
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
 	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_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 	
 	
 	<xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">

DCFG-myCertFileCred.xsd

@@ -23,15 +23,15 @@ 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/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	
 	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_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" schemaLocation="SEC-commonTypes.xsd" />
 	
 	
 	<xs:element name="myCertFileCred" substitutionGroup="m2m:sg_mgmtResource">

DCFG-registration.xsd

@@ -23,12 +23,12 @@ 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/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
 	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_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 	
 	
 	<xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">

DCFG-trustAnchorCred.xsd

@@ -23,17 +23,17 @@ 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/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 
 	
 	<xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">

README.md

@@ -17,12 +17,12 @@ This is the repository for developing XML schema for the reource types defined i
 
 \<trustAnchorCred\>
 
-DCFG-commonTypes-vx_y_0.xsd defines data types common to all resource types
+DCFG-commonTypes.xsd defines data types common to all resource types
 
 Note: The required xsd files CDT-commonTypes can be downloaded from 
-      https://git.onem2m.org/PRO/schema-definitions.git
+      https://git.onem2m.org/schema-definitions/ts-0004.git
 
-      The required xsd files SEC-commonTypes-vx_y_0 can be downloaded from 
-      https://git.onem2m.org/SEC/MAF-MEF.git
+      The required xsd files SEC-commonTypes can be downloaded from 
+      https://git.onem2m.org/schema-definitions/ts-0003.git