Skip to content

GitLab

Commit b7c4bb36 authored by Peter Niblett's avatar Peter Niblett
Browse files

Fixes to CommonTypes following PRO 16

parent ef35cef7
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 30 deletions
v1_1_0/CDT-commonTypes-v1_1_0.xsd
View file @ b7c4bb36
...@@ -69,10 +69,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -69,10 +69,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:list itemType="xs:token" /> <xs:list itemType="xs:token" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="networkaccessID"> <xs:simpleType name="triggerRecipientID">
<xs:restriction base="xs:token"> <xs:restriction base="xs:unsignedInt">
</xs:restriction> <xs:minInclusive value="0"></xs:minInclusive>
</xs:simpleType> <xs:maxInclusive value="65535"></xs:maxInclusive>
</xs:restriction>
</xs:simpleType>
<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID") --> <!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID") -->
<xs:simpleType name="listOfM2MID"> <xs:simpleType name="listOfM2MID">
...@@ -182,10 +184,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -182,10 +184,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="triggerRecipientID">
<xs:restriction base="xs:unsignedInt" />
</xs:simpleType>
<xs:simpleType name="listOfURIs"> <xs:simpleType name="listOfURIs">
<list itemType="xs:anyURI" /> <list itemType="xs:anyURI" />
</xs:simpleType> </xs:simpleType>
...@@ -199,7 +197,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -199,7 +197,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence> <xs:sequence>
<xs:sequence> <xs:sequence>
<xs:element name="tracingOption" type="xs:boolean" /> <xs:element name="tracingOption" type="xs:boolean" />
<xs:element name="tracingInfo" type="m2m:listOfM2MID" /> <xs:element name="tracingInfo" type="m2m:listOfM2MID" minOccurs="0"/>
<!-- should tracing Info be list of anyURI? --> <!-- should tracing Info be list of anyURI? -->
</xs:sequence> </xs:sequence>
</xs:sequence> </xs:sequence>
...@@ -233,14 +231,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -233,14 +231,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="responseType" type="m2m:responseType" minOccurs="0" /> <xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
<xs:element name="resultPersistence" type="m2m:timestamp" minOccurs="0" /> <xs:element name="resultPersistence" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" /> <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
<xs:element name="eventCategory" minOccurs="0"> <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
<xs:complexType>
<xs:sequence>
<xs:element name="eventCatType" type="m2m:eventCat" />
<xs:element name="eventCatNo" type="xs:nonNegativeInteger" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
...@@ -270,7 +261,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -270,7 +261,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" /> <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="contentType" type="xs:string" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" /> <xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
...@@ -341,9 +332,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -341,9 +332,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="URL" type="xs:anyURI" /> <xs:element name="URL" type="xs:anyURI" />
<xs:element name="username" type="xs:string" /> <xs:element name="username" type="xs:string" />
<xs:element name="password" type="xs:string" /> <xs:element name="password" type="xs:string" />
<xs:element name="filesize" type="xs:string" /> <xs:element name="filesize" type="xs:positiveInteger" />
<xs:element name="targetFile" type="xs:string" /> <xs:element name="targetFile" type="xs:string" />
<xs:element name="delaySeconds" type="xs:int" /> <xs:element name="delaySeconds" type="xs:positiveInteger" />
<xs:element name="successURL" type="xs:anyURI" /> <xs:element name="successURL" type="xs:anyURI" />
<xs:element name="startTime" type="m2m:timestamp" /> <xs:element name="startTime" type="m2m:timestamp" />
<xs:element name="completeTime" type="m2m:timestamp" /> <xs:element name="completeTime" type="m2m:timestamp" />
...@@ -385,14 +376,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -385,14 +376,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="execReqArgsListType"> <xs:complexType name="execReqArgsListType">
<xs:choice> <xs:choice>
<xs:element name="reset" type="m2m:resetArgsType" maxOccurs="unbounded" /> <xs:element name="reset" type="m2m:resetArgsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="reboot" type="m2m:rebootArgsType" maxOccurs="unbounded" /> <xs:element name="reboot" type="m2m:rebootArgsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="upload" type="m2m:uploadArgsType" maxOccurs="unbounded" /> <xs:element name="upload" type="m2m:uploadArgsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="download" type="m2m:downloadArgsType" maxOccurs="unbounded" /> <xs:element name="download" type="m2m:downloadArgsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded" /> <xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" maxOccurs="unbounded" /> <xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" maxOccurs="unbounded" /> <xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" minOccurs="0" maxOccurs="unbounded" />
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="mgmtLinkRef"> <xs:complexType name="mgmtLinkRef">
...@@ -429,6 +420,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -429,6 +420,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="notificationURI" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="notificationURI" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<!-- m2m:rateLimit is in the Subscription xsd file -->
<xs:complexType name="operationResult"> <xs:complexType name="operationResult">
<xs:sequence> <xs:sequence>
...@@ -443,6 +436,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -443,6 +436,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<!-- m2m:aggregatedResponse is in the ResponsePrimitive xsd file -->
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M <!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
...@@ -457,7 +451,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -457,7 +451,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="lastModifiedTime" type="m2m:timestamp" /> <xs:element name="lastModifiedTime" type="m2m:timestamp" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" /> <xs:element name="labels" type="m2m:labels" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute name="name" type="xs:token" use="required" /> <xs:attribute name="resourceName" type="xs:NCName" use="required" />
</xs:complexType> </xs:complexType>
<xs:complexType name="regularResource"> <xs:complexType name="regularResource">
......
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