Commit d63ba4e2a28c2ade4bc109e15e41a9757b33b50a

Authored by Wolfgang Granzow
1 parent 9a2368cc

Changes agreed at PRO#34/TP#34 for Rel-2

See PRO-2018-0119 for a detailed list of changes
... ... @@ -1289,6 +1289,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1289 1289 <xs:element name="creator" type="m2m:ID" minOccurs="0" />
1290 1290 <xs:element name="containerDefinition" type="xs:anyURI" />
1291 1291 <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
  1292 + <xs:element name="contentSize" type="xs:nonNegativeInteger" />
1292 1293 </xs:sequence>
1293 1294 <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
1294 1295 </xs:complexType>
... ... @@ -1308,6 +1309,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1308 1309 <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
1309 1310 <xs:element name="containerDefinition" type="xs:anyURI" />
1310 1311 <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
  1312 + <xs:element name="contentSize" type="xs:nonNegativeInteger" />
1311 1313 </xs:sequence>
1312 1314 <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
1313 1315 </xs:complexType>
... ...
... ... @@ -117,7 +117,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
117 117  
118 118 <xs:element name="resource" type="m2m:resourceWrapper" />
119 119  
120   - <xs:element name="URIList" type="m2m:listOfURIs" />
  120 + <xs:element name="URIList" >
  121 + <xs:simpleType>
  122 + <xs:list itemType="xs:anyURI" />
  123 + </xs:simpleType>
  124 + </xs:element>
121 125  
122 126 <xs:element name="URI" type="xs:anyURI" />
123 127  
... ...
... ... @@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
40 40 <!-- Resource Specific Attributes -->
41 41 <xs:element name="statsCollectID" type="xs:string" />
42 42 <xs:element name="collectingEntityID" type="m2m:ID" />
43   - <xs:element name="collectedEntityID" type="m2m:ID" />
  43 + <xs:element name="collectedEntityID" type="m2m:listOfM2MID" />
44 44 <xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" />
45 45 <xs:element name="statModel" type="m2m:statModelType" />
46 46 <xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" />
... ...