From 0936cb5b7edc1eb74fa818c579056d01b50e84c8 Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> Date: Mon, 6 Feb 2023 11:11:15 +0100 Subject: [PATCH] XSD v2_2_0 baseline --- DCFG-MAFClientRegCfg.xsd | 4 ++-- DCFG-MEFClientRegCfg.xsd | 4 ++-- DCFG-authenticationProfile.xsd | 11 +++++------ DCFG-dataCollection.xsd | 4 ++-- DCFG-myCertFileCred.xsd | 6 +++--- DCFG-registration.xsd | 4 ++-- DCFG-trustAnchorCred.xsd | 4 ++-- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd index 65e19c7..ea5c48a 100644 --- a/DCFG-MAFClientRegCfg.xsd +++ b/DCFG-MAFClientRegCfg.xsd @@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="DCFG-commonTypes.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/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd index 770d496..e199af3 100644 --- a/DCFG-MEFClientRegCfg.xsd +++ b/DCFG-MEFClientRegCfg.xsd @@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="DCFG-commonTypes.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/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd index fb2dd9c..fdef08c 100644 --- a/DCFG-authenticationProfile.xsd +++ b/DCFG-authenticationProfile.xsd @@ -31,9 +31,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="DCFG-commonTypes.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,10 +43,9 @@ 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="symmKeyValue" type="xs:hexBinary" minOccurs="0"/> <xs:element name="MAFKeyRegLabels" type="m2m:labels" minOccurs="0"/> <xs:element name="MAFKeyRegDuration" type="xs:duration" minOccurs="0"/> <xs:element name="mycertFingerprint" minOccurs="0"> diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd index dac80c6..76eca87 100644 --- a/DCFG-dataCollection.xsd +++ b/DCFG-dataCollection.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/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd index 35e4cd6..3a2f42c 100644 --- a/DCFG-myCertFileCred.xsd +++ b/DCFG-myCertFileCred.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/DCFG-registration.xsd b/DCFG-registration.xsd index 88e3579..fa56f76 100644 --- a/DCFG-registration.xsd +++ b/DCFG-registration.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/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd index 1a638fd..92fda46 100644 --- a/DCFG-trustAnchorCred.xsd +++ b/DCFG-trustAnchorCred.xsd @@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="DCFG-commonTypes.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"> -- GitLab