diff --git a/v2_6_0/CDT-CSEBase-v2_6_0.xsd b/v2_6_0/CDT-CSEBase-v2_6_0.xsd
index c0d5e2e67f72d9477af9df5efd82b3ea24251389..6bf95277e5a63c1f1195fff1b01ebfd0dc1574e9 100644
--- a/v2_6_0/CDT-CSEBase-v2_6_0.xsd
+++ b/v2_6_0/CDT-CSEBase-v2_6_0.xsd
@@ -43,7 +43,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_6_0.xsd" />
-
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_6_0.xsd" />
+
<xs:element name="CSEBase">
<xs:complexType>
<xs:complexContent>
@@ -82,6 +85,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:m2mServiceSubscriptionProfile" />
<xs:element ref="m2m:serviceSubscribedAppRule" />
+ <xs:element ref="m2m:role" />
+ <xs:element ref="m2m:token" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_6_0/CDT-commonTypes-v2_6_0.xsd b/v2_6_0/CDT-commonTypes-v2_6_0.xsd
index e6309c91cf890f1272bd12893090bc05a871a40f..c67279e754388036f92d61a4adcfe9d0d3c118c8 100644
--- a/v2_6_0/CDT-commonTypes-v2_6_0.xsd
+++ b/v2_6_0/CDT-commonTypes-v2_6_0.xsd
@@ -214,6 +214,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:union>
</xs:simpleType>
+ <xs:simpleType name="missingDataList">
+ <xs:union>
+ <simpleType>
+ <restriction base='m2m:listOfTimeStamp' />
+ </simpleType>
+ <simpleType>
+ <restriction base='m2m:listOfRelTimeStamp' />
+ </simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <!-- auxiliary data type required for definition of m2m:missingDataList -->
+ <xs:simpleType name="listOfTimeStamp">
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:timestamp" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <!-- auxiliary data type required for definition of m2m:missingDataList -->
+ <xs:simpleType name="listOfRelTimeStamp">
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:long" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="typeOfContent">
<xs:restriction base="xs:string">
@@ -336,7 +366,31 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:pattern value="application\/rdf\+xml\:1" />
</xs:restriction>
</xs:simpleType>
-
+
+ <!-- NOTE: following data types are proposed in PRO-2014-0183R0x which is not agreed yet -->
+ <!-- These are required to enable validation of data type m2m:dynAuthJWT defined in agreed
+ contribution PRO-2016-0154R03 used in <token> resource,
+ request and response primitive. Fefinitions to be reviewed after approval -->
+ <xs:simpleType name="e2eCompactJWS">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:simpleType name="e2eCompactJWE">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:simpleType name="dynAuthJWT">
+ <xs:union>
+ <!-- absolute Time -->
+ <xs:simpleType>
+ <xs:restriction base='m2m:e2eCompactJWS' />
+ </xs:simpleType>
+ <!-- relative Time -->
+ <xs:simpleType>
+ <xs:restriction base='m2m:e2eCompactJWE' />
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
<!--********************** -->
<!-- oneM2M Complex Types -->
@@ -694,9 +748,107 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:complexType name="missingData">
+ <xs:sequence>
+ <xs:element name="number" type="xs:nonNegativeInteger" minOccurs="1" />
+ <xs:element name="duration" type="xs:duration" minOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+
<!-- m2m:securityInfo, m2m:dynAuthDasRequest, m2m:dynAuthDasRequest, m2m:dynAuthDasResponse, m2m:receiverE2ERandObject
m2m:eSPrimObject and m2m:dynAuthDasRequest are in the CDT-notification xsd file -->
+
+ <xs:complexType name="tokenPermission">
+ <xs:sequence>
+ <xs:element name="resourceIDs" type="m2m:listOfM2MID" minOccurs="0" />
+ <xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" />
+ <xs:element name="roleIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!--
+ <xs:complexType name="tokenObject">
+ <xs:sequence>
+ <xs:element name="resourceIDs" type="m2m:listOfM2MID" minOccurs="0" />
+ <xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" />
+ <xs:element name="roleIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ version xs:string 1
+ tokenID m2m:tokenID 1
+ holder m2m:ID 1
+ issuer m2m:ID 1
+ notBefore m2m:timestamp 1
+ notAfter m2m:timestamp 1
+ tokenName xs:string 0..1
+ audience list of m2m:ID 0..1
+ permissions List of m2m:tokenPermission 0..1
+ extension xs:string 0..1
+
+-->
+
+ <xs:complexType name="dynAuthLocalTokenIdAssignments">
+ <xs:sequence>
+ <xs:element name="localTokenIdAssignment" minOccurs="1" maxOccurs="unbounded" >
+ <complexType>
+ <sequence>
+ <xs:element name="localTokenID" type="xs:NCName" />
+ <xs:element name="tokenID" type="m2m:tokenID" />
+ </sequence>
+ </complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="dynAuthTokenSummary">
+ <xs:sequence>
+ <xs:element name="tokenID" type="m2m:tokenID" />
+ <xs:element name="notBefore" type="m2m:timestamp" />
+ <xs:element name="notAfter" type="m2m:timestamp" />
+ <xs:element name="tokenName" type="xs:string" minOccurs="0" />
+ <xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="dynAuthTokenReqInfo">
+ <xs:sequence>
+ <xs:element name="dasInfo" minOccurs="1" maxOccurs="unbounded" >
+ <complexType>
+ <sequence>
+ <xs:element name="URI" type="xs:anyURI" />
+ <xs:element name="dasRequest" type="m2m:dynAuthDASRequest" minOccurs="0"/>
+ <xs:element name="securedDASRequest" type="m2m:dynAuthJWT" minOccurs="0"/>
+ </sequence>
+ </complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- dummy data type for missing definition of m2m:dynAuthDASRequest -->
+ <xs:simpleType name="dynAuthDASRequest">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
<!-- 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
diff --git a/v2_6_0/CDT-container-v2_6_0.xsd b/v2_6_0/CDT-container-v2_6_0.xsd
index 73c5d43d6c46ff823703b23e2cbc57e74f73cc8c..a119011200047719e50aae5865629ac6ca88d8e6 100644
--- a/v2_6_0/CDT-container-v2_6_0.xsd
+++ b/v2_6_0/CDT-container-v2_6_0.xsd
@@ -59,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:container" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd b/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
index c2462df09dea3d84ceecc8033688f92b1d0e666a..459a7e94b6a861375c7bded0bb19ba83ed18a11a 100644
--- a/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
+++ b/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
@@ -101,7 +101,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- trafficPattern -->
<xs:enumeration value="34" />
<!-- dynamicAuthorizationConsultation -->
- <xs:enumeration value="35" />
+ <xs:enumeration value="35" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -949,33 +949,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="SRole-ID">
- <xs:restriction base="xs:token">
- <!-- Software Management -->
- <xs:enumeration value="01-001" />
- <!-- Device Configuration -->
- <xs:enumeration value="02-001" />
- <!-- Device Diagnostics and Management -->
- <xs:enumeration value="02-002" />
- <!-- Device Firmware Management -->
- <xs:enumeration value="02-003" />
- <!-- Device Topology -->
- <xs:enumeration value="02-004" />
- <!-- Location -->
- <xs:enumeration value="03-001" />
- <!-- Basic Data -->
- <xs:enumeration value="04-001" />
- <!-- Onboarding -->
- <xs:enumeration value="05-001" />
- <!-- Security Administration -->
- <xs:enumeration value="06-001" />
- <!-- Groups Management -->
- <xs:enumeration value="07-001" />
- <!-- Event Collection -->
- <xs:enumeration value="08-001" />
- </xs:restriction>
- </xs:simpleType>
-
<xs:simpleType name="filterUsage">
<xs:annotation>
<xs:documentation>Used in filterCriteria</xs:documentation>
diff --git a/v2_6_0/CDT-group-v2_6_0.xsd b/v2_6_0/CDT-group-v2_6_0.xsd
index e68874dcc586b5a9a05469599f0d3b436bb1a1f8..cdbfb5ef34c4b69b8fe7fe8b07ec00b72ec332d6 100644
--- a/v2_6_0/CDT-group-v2_6_0.xsd
+++ b/v2_6_0/CDT-group-v2_6_0.xsd
@@ -89,6 +89,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_6_0/CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd b/v2_6_0/CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd
index 7f7c747f8aca649b9ee8ff2b6fd328a44c33ff3b..dc70955d22070f417027b404095301898b71db7d 100644
--- a/v2_6_0/CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd
+++ b/v2_6_0/CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd
@@ -37,11 +37,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
- <xs:element name="serviceRoles" minOccurs="0">
- <xs:simpleType>
- <xs:list itemType="m2m:SRole-ID" />
- </xs:simpleType>
- </xs:element>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v2_6_0/CDT-node-v2_6_0.xsd b/v2_6_0/CDT-node-v2_6_0.xsd
index a4c126894d3a53bf9ee5a48af2616b396a76a926..34f8e3e0b13c87b485cb3c1bd6a94418776de170 100644
--- a/v2_6_0/CDT-node-v2_6_0.xsd
+++ b/v2_6_0/CDT-node-v2_6_0.xsd
@@ -105,6 +105,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:eventLogAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_6_0/CDT-notification-v2_6_0.xsd b/v2_6_0/CDT-notification-v2_6_0.xsd
index 294ea272d53b8f81004f8f5937b3290a06bfa292..2f16b893b928c0f52ab89535dc22a924a16371c3 100644
--- a/v2_6_0/CDT-notification-v2_6_0.xsd
+++ b/v2_6_0/CDT-notification-v2_6_0.xsd
@@ -85,6 +85,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
+ <!-- dummy data type for missing definition of m2m:receiverE2ERandObject -->
+ <xs:simpleType name="receiverE2ERandObject">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <!-- dummy data type for missing definition of m2m:eSPrimObject -->
+ <xs:simpleType name="eSPrimObject">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+
<xs:simpleType name="securityInfoType">
<xs:restriction base="xs:integer">
<!-- Dynamic Authorization Request -->
diff --git a/v2_6_0/CDT-remoteCSE-v2_6_0.xsd b/v2_6_0/CDT-remoteCSE-v2_6_0.xsd
index b8735e7079fe363cfdf6604049d3e79a22e2d291..83a6c9328deb964f0b04995fec8b2867e3a09235 100644
--- a/v2_6_0/CDT-remoteCSE-v2_6_0.xsd
+++ b/v2_6_0/CDT-remoteCSE-v2_6_0.xsd
@@ -35,6 +35,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-node-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-locationPolicy-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_6_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
@@ -62,6 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:timeSeries" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -99,6 +101,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:scheduleAnnc" />
<xs:element ref="m2m:locationPolicyAnnc" />
+ <xs:element ref="m2m:timeSeries" />
+ <xs:element ref="m2m:timeSeriesAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_6_0/CDT-requestPrimitive-v2_6_0.xsd b/v2_6_0/CDT-requestPrimitive-v2_6_0.xsd
index b0aa83d060bda40575631e96f9110a97a670b852..a80c541bae0692bb42dc96efcee7d6387ffaa7d9 100644
--- a/v2_6_0/CDT-requestPrimitive-v2_6_0.xsd
+++ b/v2_6_0/CDT-requestPrimitive-v2_6_0.xsd
@@ -45,8 +45,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Content" -->
<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
- <!-- parameter "Role" -->
- <xs:element name="role" type="xs:anyType" minOccurs="0"/>
+ <!-- parameter "Role IDs" -->
+ <xs:element name="roleIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Request Expiration Timestamp" -->
@@ -71,6 +81,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
<!-- parameter "Discovery Result Type" -->
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
+ <!-- parameter "Tokens" -->
+ <xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/>
+ <!-- parameter "Token IDs" -->
+ <xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>
+ <!-- parameter "Local Token IDs" -->
+ <xs:element name="localTokenIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:NCName" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <!-- parameter "Token Request Indicator" -->
+ <xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd b/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
index 2ab443a650efd92974fe6a24bc6f7c54848c07f6..09ce6ec11ddef96879adc9f77aef9868fb1d815e 100644
--- a/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
+++ b/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
@@ -73,6 +73,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-statsCollect-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-statsConfig-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_6_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
@@ -95,6 +99,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Event Category" -->
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
+ <!-- parameter "Assigned Token Identifiers -->
+ <xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
+ <!-- parameter "Token Request Information -->
+ <xs:element name="tokenReqInfo" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -154,6 +162,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:statsCollect" />
<xs:element ref="m2m:statsConfig" />
<xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:timeSeries" />
+ <xs:element ref="m2m:timeSeriesInstance" />
+ <xs:element ref="m2m:role" />
+ <xs:element ref="m2m:token" />
</xs:choice>
<xs:element name="URI" type="xs:anyURI" />
</xs:sequence>
diff --git a/v2_6_0/CDT-role-v2_6_0.xsd b/v2_6_0/CDT-role-v2_6_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..6555f656e3d6ea31824d47990f40cdb79802ec85
--- /dev/null
+++ b/v2_6_0/CDT-role-v2_6_0.xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
+and applicable regulations. No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-subscription-v2_6_0.xsd" />
+
+ <xs:element name="role">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="roleID" type="m2m:roleID" />
+ <xs:element name="issuer" type="m2m:ID" />
+ <xs:element name="holder" type="m2m:ID" />
+ <xs:element name="notBefore" type="m2m:timestamp" />
+ <xs:element name="notAfter" type="m2m:timestamp" />
+ <xs:element name="roleName" type="xs:string" minOccurs="0" />
+ <xs:element name="tokenLink" type="xs:anyURI" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd b/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
index 3578f94149f4fc227d656a64a9d4bebb0bfe5cf5..00c2e0d8451d1ff7f04b77f0028799705fbe80d6 100644
--- a/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
+++ b/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
@@ -33,7 +33,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
- <xs:extension base="m2m:regularResource">
+ <xs:extension base="m2m:announceableResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
@@ -54,4 +54,28 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
</xs:element>
+
+ <xs:element name="semanticDescriptorAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="descriptorRepresentation" type="m2m:descriptorRepresentation" minOccurs="0" />
+ <xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
+ <xs:element name="descriptor" type="xs:base64Binary" minOccurs="0" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
diff --git a/v2_6_0/CDT-subscription-v2_6_0.xsd b/v2_6_0/CDT-subscription-v2_6_0.xsd
index 6595e1a2a016ed730425dbb147c49d663c377ffc..5c2084baa5f32c523390fe1432d608faf6dff875 100644
--- a/v2_6_0/CDT-subscription-v2_6_0.xsd
+++ b/v2_6_0/CDT-subscription-v2_6_0.xsd
@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_6_0.xsd" />
<xs:element name="subscription">
<xs:complexType>
@@ -56,8 +57,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" />
- <xs:element ref="m2m:schedule" />
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
+ </xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
@@ -80,6 +84,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
+ <xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
</xs:sequence>
</xs:complexType>
diff --git a/v2_6_0/CDT-timeSeries-v2_6_0.xsd b/v2_6_0/CDT-timeSeries-v2_6_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..484beedadb3288d67a5d880d2c1f55b9923c5382
--- /dev/null
+++ b/v2_6_0/CDT-timeSeries-v2_6_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
+and applicable regulations. No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_6_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_6_0.xsd" />
+
+
+ <xs:element name="timeSeries">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <xs:element name="creator" type="m2m:ID" />
+ <!-- Resource Specific Attributes -->
+ <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
+ <xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
+ <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
+ <xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
+ <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:element name="latest" type="xs:anyURI" />
+ <xs:element name="oldest" type="xs:anyURI" />
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:timeSeriesInstance" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="timeSeriesAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
+ <!-- Resource Specific Attributes -->
+ <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
+ <xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
+ <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
+ <xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
+ <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:timeSeriesInstance" />
+ <xs:element ref="m2m:timeSeriesInstanceAnnc" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v2_6_0/CDT-timeSeriesInstance-v2_6_0.xsd b/v2_6_0/CDT-timeSeriesInstance-v2_6_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..0fa3c31480b19c81b26bbfde785d6639ca18df0f
--- /dev/null
+++ b/v2_6_0/CDT-timeSeriesInstance-v2_6_0.xsd
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
+and applicable regulations. No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes-v2_6_0.xsd" />
+
+ <xs:element name="timeSeriesInstance">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableSubordinateResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" />
+ <xs:element name="content" type="xs:anySimpleType" />
+ <xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
+
+ <!-- Child Resources -->
+
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="timeSeriesInstanceAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedSubordinateResource">
+ <xs:sequence>
+ <xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="content" type="xs:anySimpleType" minOccurs="0" />
+ <xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />
+
+ <!-- Child Resources -->
+
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/v2_6_0/CDT-token-v2_6_0.xsd b/v2_6_0/CDT-token-v2_6_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..8bafe0e2fedecc116e2db779377d57b3b6ec3758
--- /dev/null
+++ b/v2_6_0/CDT-token-v2_6_0.xsd
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
+and applicable regulations. No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-subscription-v2_6_0.xsd" />
+
+ <xs:element name="token">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="tokenID" type="m2m:tokenID" />
+ <xs:element name="tokenObject" type="m2m:dynAuthJWT" />
+ <xs:element name="version" type="xs:string" minOccurs="0"/>
+ <xs:element name="issuer" type="m2m:ID" minOccurs="0" />
+ <xs:element name="holder" type="m2m:ID" minOccurs="0"/>
+ <xs:element name="notBefore" type="m2m:timestamp" />
+ <xs:element name="notAfter" type="m2m:timestamp" minOccurs="0"/>
+ <xs:element name="tokenName" type="xs:string" minOccurs="0" />
+ <xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" />
+
+ <xs:element name="permissions" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="permission" type="m2m:tokenPermission" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="extension" type="xs:string" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file