Commit d63ba4e2 authored by Wolfgang Granzow's avatar Wolfgang Granzow

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

See PRO-2018-0119 for a detailed list of changes
parent 9a2368cc
...@@ -1289,6 +1289,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1289,6 +1289,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="creator" type="m2m:ID" minOccurs="0" /> <xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="containerDefinition" type="xs:anyURI" /> <xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" />
</xs:sequence> </xs:sequence>
<xs:attribute name="resourceName" type="m2m:resourceName" use="required" /> <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType> </xs:complexType>
...@@ -1308,6 +1309,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1308,6 +1309,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="containerDefinition" type="xs:anyURI" /> <xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" />
</xs:sequence> </xs:sequence>
<xs:attribute name="resourceName" type="m2m:resourceName" use="required" /> <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType> </xs:complexType>
......
...@@ -117,7 +117,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -117,7 +117,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resource" type="m2m:resourceWrapper" /> <xs:element name="resource" type="m2m:resourceWrapper" />
<xs:element name="URIList" type="m2m:listOfURIs" /> <xs:element name="URIList" >
<xs:simpleType>
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
</xs:element>
<xs:element name="URI" type="xs:anyURI" /> <xs:element name="URI" type="xs:anyURI" />
......
...@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="statsCollectID" type="xs:string" /> <xs:element name="statsCollectID" type="xs:string" />
<xs:element name="collectingEntityID" type="m2m:ID" /> <xs:element name="collectingEntityID" type="m2m:ID" />
<xs:element name="collectedEntityID" type="m2m:ID" /> <xs:element name="collectedEntityID" type="m2m:listOfM2MID" />
<xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" /> <xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" />
<xs:element name="statModel" type="m2m:statModelType" /> <xs:element name="statModel" type="m2m:statModelType" />
<xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" /> <xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment