Commit e86154c08e838d67cfde0af97687495dfa79dee1

Authored by Wolfgang Granzow
1 parent 2ca8def9

updated schemaLocation attribute values

... ... @@ -4,17 +4,24 @@ Field Device Configuration schemas
4 4 This is the repository for developing XML schema for the reource types defined in oneM2M TS-0022
5 5  
6 6 \<authenticationProfile\>
  7 +
7 8 \<dataCollection\>
  9 +
8 10 \<MEFClientRegCfg\>
  11 +
9 12 \<registration\>
  13 +
10 14 \<MAFClientRegCfg\>
  15 +
11 16 \<myCertFileCred\>
  17 +
12 18 \<trustAnchorCred\>
13 19  
14 20 DCFG-commonTypes-vx_y_0.xsd defines data types common to all resource types
15 21  
16 22 Note: The required xsd files CDT-commonTypes-vx_y_0 can be downloaded from
17 23 https://git.onem2m.org/PRO/XSD.git
  24 +
18 25 The required xsd files SEC-commonTypes-vx_y_0 can be downloaded from
19 26 https://git.onem2m.org/SEC/MAF-MEF.git
20 27  
... ...
... ... @@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30  
31 31 elementFormDefault="unqualified" attributeFormDefault="unqualified">
32 32  
33   - <xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
  33 + <xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
34 34  
35   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
36   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
  35 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  36 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
37 37  
38 38  
39 39 <xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
... ...
... ... @@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30  
31 31 elementFormDefault="unqualified" attributeFormDefault="unqualified">
32 32  
33   - <xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
  33 + <xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
34 34  
35   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
36   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
  35 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  36 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
37 37  
38 38  
39 39 <xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
... ...
... ... @@ -29,11 +29,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
30 30 elementFormDefault="unqualified" attributeFormDefault="unqualified">
31 31  
32   - <xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
  32 + <xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
33 33  
34   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
35   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
36   - <xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
  34 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  35 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
  36 + <xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
37 37  
38 38 <xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
39 39 <xs:complexType>
... ... @@ -43,8 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <!-- Resource Specific Attributes -->
44 44 <xs:sequence>
45 45 <xs:element name="SUID" type="m2m:suid"/>
46   - <xs:element name="TLSCiphersuites" type="dcfg:listOfTLSCiphersuite"
47   - minOccurs="0"/>
  46 + <xs:element name="TLSCiphersuites" type="dcfg:listOfTLSCiphersuite" minOccurs="0"/>
48 47 <xs:element name="symmKeyID" type="sec:credentialID" minOccurs="0"/>
49 48 <xs:element name="symmKeyValue" type="xs:base64Binary" minOccurs="0"/>
50 49 <xs:element name="MAFKeyRegLabels" type="m2m:labels" minOccurs="0"/>
... ...
... ... @@ -29,8 +29,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 xmlns:xs="http://www.w3.org/2001/XMLSchema"
30 30 elementFormDefault="unqualified" attributeFormDefault="unqualified">
31 31  
32   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
33   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
  32 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  33 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
34 34  
35 35  
36 36 <xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">
... ...
... ... @@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29  
30 30 elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
31 31  
32   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
33   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
34   - <xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
  32 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  33 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
  34 + <xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
35 35  
36 36  
37 37 <xs:element name="myCertFileCred" substitutionGroup="m2m:sg_mgmtResource">
... ...
... ... @@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
27 27 xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
28 28 elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
29 29  
30   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
31   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
  30 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  31 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
32 32  
33 33  
34 34 <xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">
... ...
... ... @@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30  
31 31 elementFormDefault="unqualified" attributeFormDefault="unqualified">
32 32  
33   - <xs:include schemaLocation="DCFG-commonTypes-v2_1_0.xsd" />
  33 + <xs:include schemaLocation="DCFG-commonTypes-v2_2_0.xsd" />
34 34  
35   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_12_0.xsd" />
36   - <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
  35 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_15_0.xsd" />
  36 + <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
37 37  
38 38  
39 39 <xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">
... ...