diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd index 65e19c78966fd36c94e616b7e2f054d1e97a5047..ea5c48a2b56858a7416b8772d3f9c91c56ced981 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 770d4969071dc3706c0257f5d71eea451c6a2ccc..e199af3496c37c4c4d007abf44db23579c1ce893 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 fb2dd9c7066b76bb38c13553ceeabb110c9e5d1d..fdef08ca3517225d2363f478ad1034a04820ab1a 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 dac80c690777abaf094843c8127a407cb29cbb4d..76eca871ab6937bf4f042d36d4bb83ae9478cd5b 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 35e4cd6f1ac7ea7cbcf2854ce79c6a479fac94fb..3a2f42c0bf8c726530f4721a738f02cb16b4c863 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 88e35795d99410f4b3e1669f4fb4d3bae6b8029c..fa56f76eea72013825688901c127122bf0ac32a3 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 1a638fdc39112bd81404963cb26a1fa859345b89..92fda467fd08136c69746a7c13fdea9c7216516a 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">