Skip to content
Snippets Groups Projects
Commit 940b5384 authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

changes agreed in PRO-2015-0845-Timestamp_format_in_primitives

parent 1ea84ca7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
v1_3_0/CDT-commonTypes-v1_3_0.xsd
+ 20
− 5
View file @ 940b5384
...@@ -142,6 +142,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -142,6 +142,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:pattern value="\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d"></xs:pattern> <xs:pattern value="\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d"></xs:pattern>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="absRelTimestamp">
<xs:union>
<!-- absolute Time -->
<xs:simpleType>
<xs:restriction base='m2m:timestamp' />
</xs:simpleType>
<!-- relative Time -->
<xs:simpleType>
<xs:restriction base='xs:long' />
</xs:simpleType>
</xs:union>
</xs:simpleType>
<xs:simpleType name="typeOfContent"> <xs:simpleType name="typeOfContent">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
...@@ -255,11 +270,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -255,11 +270,11 @@ 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="name" type="xs:NCName" minOccurs="0" /> <xs:element name="name" type="xs:NCName" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" /> <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" /> <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" /> <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0" /> <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0" /> <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0" />
<xs:element name="resultPersistence" type="xs:duration" minOccurs="0" /> <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" /> <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" /> <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
...@@ -461,7 +476,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -461,7 +476,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="to" type="xs:anyURI" minOccurs="0" /> <xs:element name="to" type="xs:anyURI" minOccurs="0" />
<xs:element name="from" type="m2m:ID" minOccurs="0" /> <xs:element name="from" type="m2m:ID" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" /> <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" /> <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" /> <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
......
v1_3_0/CDT-requestPrimitive-v1_3_0.xsd
+ 4
− 4
View file @ 940b5384
...@@ -50,15 +50,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -50,15 +50,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- 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 "Request Expiration Timestamp" --> <!-- parameter "Request Expiration Timestamp" -->
<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/> <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" 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:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Operation Execution Time" --> <!-- parameter "Operation Execution Time" -->
<xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/> <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Response Type" --> <!-- parameter "Response Type" -->
<xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/> <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
<!-- parameter "Result Persistence" --> <!-- parameter "Result Persistence" -->
<xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/> <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- 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" -->
......
v1_3_0/CDT-responsePrimitive-v1_3_0.xsd
+ 1
− 1
View file @ 940b5384
...@@ -48,7 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -48,7 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- 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:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Event Category" --> <!-- parameter "Event Category" -->
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" /> <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
</xs:sequence> </xs:sequence>
......
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