Commit 14d59ad6d92d1befabe8f937d74656a0750aaa94

Authored by Wolfgang Granzow
1 parent 9d8f9657

Changes agreed at PRO#32.2 (Interim) meeting

See summary of changes in PRO-2018-0054
... ... @@ -177,11 +177,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
177 177 </xs:restriction>
178 178 </xs:simpleType>
179 179  
180   -
  180 + <xs:simpleType name="pointOfAccess">
  181 + <xs:restriction base="xs:anyURI">
  182 + <xs:pattern value="(http|HTTP|coap|COAP|ws|WS)(s|S)?://[\w/!#$^_\.+&amp;\-:;=]+" />
  183 + </xs:restriction>
  184 + </xs:simpleType>
  185 +
181 186 <xs:simpleType name="poaList">
182 187 <xs:restriction>
183 188 <xs:simpleType>
184   - <xs:list itemType="xs:string" />
  189 + <xs:list itemType="m2m:pointOfAccess" />
185 190 </xs:simpleType>
186 191 <xs:minLength value="1" />
187 192 </xs:restriction>
... ... @@ -337,11 +342,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
337 342 </xs:simpleType>
338 343  
339 344 <xs:simpleType name="listOfDuration">
340   - <list itemType="xs:duration" />
  345 + <xs:restriction>
  346 + <xs:simpleType>
  347 + <xs:list itemType="xs:duration" />
  348 + </xs:simpleType>
  349 + <xs:minLength value="1" />
  350 + </xs:restriction>
341 351 </xs:simpleType>
342   -
  352 +
343 353 <xs:simpleType name="attributeList">
344   - <list itemType="xs:NCName" />
  354 + <xs:restriction>
  355 + <xs:simpleType>
  356 + <xs:list itemType="xs:NCName" />
  357 + </xs:simpleType>
  358 + <xs:minLength value="1" />
  359 + </xs:restriction>
345 360 </xs:simpleType>
346 361  
347 362 <xs:simpleType name="resourceTypeList">
... ... @@ -520,6 +535,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
520 535 </xs:simpleType>
521 536 </xs:element>
522 537 <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  538 + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
523 539 </xs:sequence>
524 540 </xs:complexType>
525 541  
... ...
... ... @@ -775,9 +775,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
775 775 <!-- cmdhNwAccessRule -->
776 776 <xs:enumeration value="1018" />
777 777 <!-- cmdhBuffer -->
778   - <xs:enumeration value="1019" />
779   -
780   -
  778 + <xs:enumeration value="1019" />
  779 + <!-- registration -->
  780 + <xs:enumeration value="1020" />
  781 + <!-- dataCollection -->
  782 + <xs:enumeration value="1021" />
  783 + <!-- authenticationProfile -->
  784 + <xs:enumeration value="1022" />
  785 + <!-- myCertFileCred -->
  786 + <xs:enumeration value="1023" />
  787 + <!-- trustAnchorCred -->
  788 + <xs:enumeration value="1024" />
  789 + <!-- MAFClientRegCfg -->
  790 + <xs:enumeration value="1025" />
  791 + <!-- MEFClientRegCfg -->
  792 + <xs:enumeration value="1026" />
781 793 </xs:restriction>
782 794 </xs:simpleType>
783 795  
... ...
... ... @@ -23,39 +23,48 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
23 23  
24 24 -->
25 25  
26   -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
27   - xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
28   - elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  26 +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
  27 + targetNamespace="http://www.onem2m.org/xml/protocols"
  28 + xmlns:m2m="http://www.onem2m.org/xml/protocols"
  29 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
  30 + xmlns:xs="http://www.w3.org/2001/XMLSchema">
29 31  
30   - <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
31   - <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" />
32   - <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" />
  32 + <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd"/>
  33 + <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd"/>
  34 + <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd"/>
33 35  
34 36 <xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
35 37 <xs:complexType>
36 38 <xs:complexContent>
37 39 <!-- Inherit common attributes for announceable Resources -->
38 40 <xs:extension base="m2m:announceableResource">
39   - <xs:sequence>
  41 + <xs:sequence>
40 42 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
41   - <xs:element name="creator" type="m2m:ID" minOccurs="0" />
  43 + <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
42 44 <!-- Resource Specific Attributes -->
43   - <xs:element name="memberType" type="m2m:memberType" />
44   - <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
45   - <xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
46   - <xs:element name="memberIDs" type="m2m:listOfURIs" />
47   - <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
  45 + <xs:element name="memberType" type="m2m:memberType"/>
  46 + <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"/>
  47 + <xs:element name="maxNrOfMembers" type="xs:positiveInteger"/>
  48 + <xs:element name="memberIDs">
  49 + <xs:simpleType>
  50 + <xs:list itemType="xs:anyURI"/>
  51 + </xs:simpleType>
  52 + </xs:element>
  53 + <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs"
  54 + minOccurs="0"/>
48 55 <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
49   - <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
50   - <xs:element name="groupName" type="xs:string" minOccurs="0" />
51   - <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
52   -
  56 + <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy"
  57 + minOccurs="0"/>
  58 + <xs:element name="groupName" type="xs:string" minOccurs="0"/>
  59 + <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
  60 +
53 61 <!-- Child Resources -->
54 62 <xs:choice minOccurs="0" maxOccurs="1">
55   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
  63 + <xs:element name="childResource" type="m2m:childResourceRef"
  64 + maxOccurs="unbounded"/>
56 65 <xs:choice minOccurs="1" maxOccurs="unbounded">
57   - <xs:element ref="m2m:subscription" />
58   - <xs:element ref="m2m:semanticDescriptor" />
  66 + <xs:element ref="m2m:subscription"/>
  67 + <xs:element ref="m2m:semanticDescriptor"/>
59 68 </xs:choice>
60 69 </xs:choice>
61 70 </xs:sequence>
... ... @@ -71,29 +80,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
71 80 <xs:extension base="m2m:announcedResource">
72 81 <!-- Resource Specific Attributes -->
73 82 <xs:sequence>
74   - <xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
75   - <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
76   - <xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0" />
  83 + <xs:element name="memberType" type="m2m:memberType" minOccurs="0"/>
  84 + <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"
  85 + minOccurs="0"/>
  86 + <xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0"/>
77 87 <xs:element name="memberIDs" minOccurs="0">
78   - <xs:simpleType>
79   - <xs:list itemType="xs:anyURI" />
80   - </xs:simpleType>
81   - </xs:element>
82   - <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
83   - <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" />
84   - <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
85   - <xs:element name="groupName" type="xs:string" minOccurs="0" />
86   - <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
87   -
88   - <!-- Child Resources -->
89   - <xs:choice minOccurs="0" maxOccurs="1">
90   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
91   - <xs:choice minOccurs="1" maxOccurs="unbounded">
92   - <xs:element ref="m2m:subscription" />
93   - <xs:element ref="m2m:semanticDescriptor" />
94   - <xs:element ref="m2m:semanticDescriptorAnnc" />
95   - </xs:choice>
96   - </xs:choice>
  88 + <xs:simpleType>
  89 + <xs:list itemType="xs:anyURI"/>
  90 + </xs:simpleType>
  91 + </xs:element>
  92 + <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs"
  93 + minOccurs="0"/>
  94 + <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
  95 + <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy"
  96 + minOccurs="0"/>
  97 + <xs:element name="groupName" type="xs:string" minOccurs="0"/>
  98 + <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
  99 +
  100 + <!-- Child Resources -->
  101 + <xs:choice minOccurs="0" maxOccurs="1">
  102 + <xs:element name="childResource" type="m2m:childResourceRef"
  103 + maxOccurs="unbounded"/>
  104 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  105 + <xs:element ref="m2m:subscription"/>
  106 + <xs:element ref="m2m:semanticDescriptor"/>
  107 + <xs:element ref="m2m:semanticDescriptorAnnc"/>
  108 + </xs:choice>
  109 + </xs:choice>
97 110 </xs:sequence>
98 111 </xs:extension>
99 112 </xs:complexContent>
... ...
... ... @@ -117,6 +117,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
117 117 <!-- parameter "Token Request Indicator" -->
118 118 <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/>
119 119 <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  120 + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
120 121 </xs:sequence>
121 122 </xs:complexType>
122 123 </xs:element>
... ...
... ... @@ -107,7 +107,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
107 107 <xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
108 108 <!-- parameter "Token Request Information -->
109 109 <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
110   - <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  110 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  111 + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
111 112 </xs:sequence>
112 113 </xs:complexType>
113 114 </xs:element>
... ...