From 940b538420efb085944effc722768d15cc680874 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Mon, 10 Aug 2015 18:55:38 +0200
Subject: [PATCH] changes agreed in
PRO-2015-0845-Timestamp_format_in_primitives
---
v1_3_0/CDT-commonTypes-v1_3_0.xsd | 25 ++++++++++++++++++++-----
v1_3_0/CDT-requestPrimitive-v1_3_0.xsd | 8 ++++----
v1_3_0/CDT-responsePrimitive-v1_3_0.xsd | 2 +-
3 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/v1_3_0/CDT-commonTypes-v1_3_0.xsd b/v1_3_0/CDT-commonTypes-v1_3_0.xsd
index 5a1293b..4009ecf 100644
--- a/v1_3_0/CDT-commonTypes-v1_3_0.xsd
+++ b/v1_3_0/CDT-commonTypes-v1_3_0.xsd
@@ -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:restriction>
</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:restriction base="xs:string">
@@ -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="name" type="xs:NCName" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" 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="eventCategory" type="m2m:eventCat" 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
<xs:element name="to" type="xs:anyURI" minOccurs="0" />
<xs:element name="from" type="m2m:ID" 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:sequence>
</xs:complexType>
diff --git a/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd b/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd
index 61f360a..e15fc47 100644
--- a/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd
+++ b/v1_3_0/CDT-requestPrimitive-v1_3_0.xsd
@@ -50,15 +50,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- 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" -->
- <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- 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" -->
<xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
<!-- parameter "Result Persistence" -->
- <xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/>
+ <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Result Content" -->
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
<!-- parameter "Event Category" -->
diff --git a/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd b/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd
index fc06255..9aa98c9 100644
--- a/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd
+++ b/v1_3_0/CDT-responsePrimitive-v1_3_0.xsd
@@ -48,7 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- 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" -->
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
</xs:sequence>
--
GitLab