Commit 263f8865 authored by Wolfgang Granzow's avatar Wolfgang Granzow

request/response primitives and notification

In CDT-commonTypes, the definition of ipv4 and ipv6 data types has been
removed since presently these types are defined in
CDT-accessControlPolicy
parent 70e8b81e
...@@ -148,13 +148,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -148,13 +148,13 @@ 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="ipv4"> <!-- <xs:simpleType name="ipv4">
<xs:restriction base="xs:token" /> <xs:restriction base="xs:token" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="ipv6"> <xs:simpleType name="ipv6">
<xs:restriction base="xs:token" /> <xs:restriction base="xs:token" />
</xs:simpleType> </xs:simpleType> -->
<xs:simpleType name="pOAList"> <xs:simpleType name="pOAList">
<xs:list itemType="xs:string" /> <xs:list itemType="xs:string" />
......
...@@ -25,6 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -25,6 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema"> xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd"/> <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd"/>
<xs:include schemaLocation="CDT-responsePrimitive-v0_8_0.xsd"/>
<!-- TODO: This "notification data object" does not comply (and does not need to comply) with the <!-- TODO: This "notification data object" does not comply (and does not need to comply) with the
generic <resourceType> specification conventions. One and only one instance of this data object is included generic <resourceType> specification conventions. One and only one instance of this data object is included
...@@ -34,23 +35,31 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -34,23 +35,31 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
an unbounded sequence of singleNotification elements only. an unbounded sequence of singleNotification elements only.
We need to add into TS-0004 information which corresponds to the <resourceType> tables shown in TS-0001. We need to add into TS-0004 information which corresponds to the <resourceType> tables shown in TS-0001.
--> -->
<xs:element name="notification"> <xs:element name="notification" type="m2m:notification" />
<xs:complexType>
<xs:choice> <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />
<!-- Resource Specific Attributes -->
<xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" minOccurs="0"/> <!-- TODO: The element defined below cannot be denoted "responsePrimitive" as defined in Table 7.4.1.1.1-2 of TS-0004.
<xs:element name="singleNotification" type="m2m:singleNotification" minOccurs="0"/> This causes conflict due to two global components with the same name. Whatever element name is used,
</xs:choice> it introduces an extra wrapping level around the requestPrimitive object.
</xs:complexType> I guess this can be avoided only by allowing the m2m:responsePrimitive to be included into a
</xs:element> primitiveContent directly
-->
<xs:element name="notificationContent" >
<xs:complexType>
<xs:sequence>
<xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:complexType name="aggregatedNotification"> <xs:complexType name="aggregatedNotification">
<xs:sequence> <xs:sequence>
<xs:element name="singleNotification" type="m2m:singleNotification" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="singleNotification"> <xs:complexType name="notification">
<xs:sequence> <xs:sequence>
<xs:element name="notificationEvent" type="m2m:notificationEventList" minOccurs="0"/> <xs:element name="notificationEvent" type="m2m:notificationEventList" minOccurs="0"/>
<xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/> <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
...@@ -69,7 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -69,7 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="notificationEvent"> <xs:complexType name="notificationEvent">
<xs:sequence> <xs:sequence>
<xs:element name="representation" type="xs:string" minOccurs="0"/> <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/> <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
<xs:element name="operationMonitor" type="m2m:operationMonitorType" minOccurs="0"/> <xs:element name="operationMonitor" type="m2m:operationMonitorType" minOccurs="0"/>
</xs:sequence> </xs:sequence>
......
...@@ -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
<!-- parameter "From" --> <!-- parameter "From" -->
<xs:element name="from" type="m2m:ID" minOccurs="1"/> <xs:element name="from" type="m2m:ID" minOccurs="1"/>
<!-- parameter "Request Identifier" --> <!-- parameter "Request Identifier" -->
<xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="0"/> <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
<!-- parameter "ResourceType" --> <!-- parameter "ResourceType" -->
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/> <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Name" --> <!-- parameter "Name" -->
...@@ -64,7 +64,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -64,7 +64,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Result Content" --> <!-- parameter "Result Content" -->
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/> <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
<!-- parameter "Event Category" --> <!-- parameter "Event Category" -->
<xs:element name="eventCategory" type="m2m:eventCatType" minOccurs="0"/> <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
<!-- parameter "Delivery Aggregation" --> <!-- parameter "Delivery Aggregation" -->
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/> <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
<!-- parameter "Group Request Identifier" --> <!-- parameter "Group Request Identifier" -->
...@@ -73,12 +73,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -73,12 +73,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
<!-- parameter "Discovery Result Type" --> <!-- parameter "Discovery Result Type" -->
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/> <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
<!-- TODO: Role is still included in TS-0004v081, it was removed in TS-0001. Proposal: remove it from XSD and TS-0004-->
<!-- parameter "Role" -->
<!-- <xs:element name="role" type="xs:string" minOccurs="0"/> -->
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="attributeList" type="m2m:attributeList" />
</xs:schema> </xs:schema>
...@@ -32,34 +32,43 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -32,34 +32,43 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="responsePrimitive" > <xs:element name="responsePrimitive" >
<xs:complexType> <xs:complexType>
<!-- TODO: check if the sequence of elements is adequate -->
<xs:sequence> <xs:sequence>
<!-- parameter "To" --> <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
<xs:element name="to" type="xs:anyURI" minOccurs="0"/> Response Status Code in TS-0004 -->
<!-- parameter "From" --> <!-- TODO: Table 6.4.2-1 of TS-0004 needs to be corrected: "m2m:responseStatus" to be replaced by "m2m:responseStatusCode" -->
<xs:element name="from" type="m2m:ID" minOccurs="0"/> <!-- parameter "Response Status Code" -->
<xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
<!-- parameter "Request Identifier" --> <!-- parameter "Request Identifier" -->
<xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="0"/> <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
<!-- parameter "Content" (of the primitive) --> <!-- parameter "Content" (of the primitive) -->
<xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/> <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "To" -->
<xs:element name="to" type="m2m:ID" minOccurs="0"/>
<!-- parameter "From" -->
<xs:element name="from" type="m2m:ID" minOccurs="0"/>
<!-- parameter "Originating Timestamp" --> <!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/> <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Result Expiration Timestamp" --> <!-- parameter "Result Expiration Timestamp" -->
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/> <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Event Category" --> <!-- parameter "Event Category" -->
<xs:element name="eventCategory" type="m2m:eventCatType" minOccurs="0"/> <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
<!-- TODO: TS-0001 defines Response Code and Status Code primitive parameters rather than Response Status Code used in TS-0004 -->
<!-- parameter "Response Status Code" -->
<xs:element name="responseStatusCode" type="m2m:responseStatus" minOccurs="0"/>
<!-- TODO: Pending Request primitive parameter is not defined in TS-0001 (and probably never was)
Has it been defined by PRO WG? -->
<!-- parameter "Pending Requests" -->
<!-- TOTO: the data type for this parameter is currently undefined in TS-0004 -->
<xs:element name="pendingRequests" type="xs:boolean" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="resource" type="m2m:resourceWrapper" />
<xs:element name="URIlist" type="m2m:listOfURIs" />
<xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
<xs:complexType name="aggregatedResponse">
<xs:sequence>
<xs:element ref="m2m:responsePrimitive" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:schema> </xs:schema>
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