From 143721f8e8ea40db7f42d148665fc4cf19eba84f Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Wed, 17 Aug 2016 12:03:31 +0200
Subject: [PATCH] Rel-2 changes agreed at PRO#24
see PRO-2016-0350 for detailed list of changes
---
v2_7_0/CDT-AE-v2_7_0.xsd | 22 +-
v2_7_0/CDT-CSEBase-v2_7_0.xsd | 7 +-
v2_7_0/CDT-accessControlPolicy-v2_7_0.xsd | 8 +-
v2_7_0/CDT-activeCmdhPolicy-v2_7_0.xsd | 4 +-
v2_7_0/CDT-allJoynApp-v2_7_0.xsd | 82 +++++
v2_7_0/CDT-allJoynInterface-v2_7_0.xsd | 91 +++++
v2_7_0/CDT-allJoynMethod-v2_7_0.xsd | 82 +++++
v2_7_0/CDT-allJoynMethodCall-v2_7_0.xsd | 79 +++++
v2_7_0/CDT-allJoynProperty-v2_7_0.xsd | 78 +++++
v2_7_0/CDT-allJoynSvcObject-v2_7_0.xsd | 84 +++++
v2_7_0/CDT-areaNwkDeviceInfo-v2_7_0.xsd | 6 +-
v2_7_0/CDT-areaNwkInfo-v2_7_0.xsd | 6 +-
v2_7_0/CDT-battery-v2_7_0.xsd | 6 +-
v2_7_0/CDT-cmdhBuffer-v2_7_0.xsd | 4 +-
v2_7_0/CDT-cmdhDefEcValue-v2_7_0.xsd | 4 +-
v2_7_0/CDT-cmdhDefaults-v2_7_0.xsd | 2 +-
v2_7_0/CDT-cmdhEcDefParamValues-v2_7_0.xsd | 4 +-
v2_7_0/CDT-cmdhLimits-v2_7_0.xsd | 4 +-
v2_7_0/CDT-cmdhNetworkAccessRules-v2_7_0.xsd | 4 +-
v2_7_0/CDT-cmdhNwAccessRule-v2_7_0.xsd | 5 +-
v2_7_0/CDT-cmdhPolicy-v2_7_0.xsd | 4 +-
v2_7_0/CDT-commonTypes-v2_7_0.xsd | 322 ++++++++++++++----
v2_7_0/CDT-container-v2_7_0.xsd | 16 +-
v2_7_0/CDT-contentInstance-v2_7_0.xsd | 6 +-
v2_7_0/CDT-delivery-v2_7_0.xsd | 6 +-
v2_7_0/CDT-deviceCapability-v2_7_0.xsd | 6 +-
v2_7_0/CDT-deviceInfo-v2_7_0.xsd | 6 +-
...ynamicAuthorizationConsultation-v2_7_0.xsd | 4 +-
v2_7_0/CDT-enumerationTypes-v2_7_0.xsd | 240 +++++++++++--
v2_7_0/CDT-eventConfig-v2_7_0.xsd | 4 +-
v2_7_0/CDT-eventLog-v2_7_0.xsd | 6 +-
v2_7_0/CDT-execInstance-v2_7_0.xsd | 4 +-
v2_7_0/CDT-firmware-v2_7_0.xsd | 6 +-
...icInterworkingOperationInstance-v2_7_0.xsd | 90 +++++
.../CDT-genericInterworkingService-v2_7_0.xsd | 88 +++++
v2_7_0/CDT-group-v2_7_0.xsd | 22 +-
v2_7_0/CDT-locationPolicy-v2_7_0.xsd | 6 +-
...T-m2mServiceSubscriptionProfile-v2_7_0.xsd | 4 +-
v2_7_0/CDT-memory-v2_7_0.xsd | 6 +-
v2_7_0/CDT-mgmtCmd-v2_7_0.xsd | 4 +-
v2_7_0/CDT-node-v2_7_0.xsd | 9 +-
v2_7_0/CDT-notification-v2_7_0.xsd | 67 +---
...notificationTargetMgmtPolicyRef-v2_7_0.xsd | 4 +-
.../CDT-notificationTargetPolicy-v2_7_0.xsd | 4 +-
v2_7_0/CDT-policyDeletionRules-v2_7_0.xsd | 4 +-
v2_7_0/CDT-pollingChannel-v2_7_0.xsd | 9 +-
v2_7_0/CDT-reboot-v2_7_0.xsd | 6 +-
v2_7_0/CDT-remoteCSE-v2_7_0.xsd | 22 +-
v2_7_0/CDT-request-v2_7_0.xsd | 4 +-
v2_7_0/CDT-requestPrimitive-v2_7_0.xsd | 2 +-
v2_7_0/CDT-responsePrimitive-v2_7_0.xsd | 79 ++---
v2_7_0/CDT-role-v2_7_0.xsd | 4 +-
v2_7_0/CDT-schedule-v2_7_0.xsd | 6 +-
v2_7_0/CDT-semanticDescriptor-v2_7_0.xsd | 6 +-
.../CDT-serviceSubscribedAppRule-v2_7_0.xsd | 4 +-
v2_7_0/CDT-serviceSubscribedNode-v2_7_0.xsd | 4 +-
v2_7_0/CDT-software-v2_7_0.xsd | 6 +-
v2_7_0/CDT-statsCollect-v2_7_0.xsd | 4 +-
v2_7_0/CDT-statsConfig-v2_7_0.xsd | 4 +-
v2_7_0/CDT-subscription-v2_7_0.xsd | 4 +-
v2_7_0/CDT-svcFwWrapper-v2_7_0.xsd | 77 +++++
v2_7_0/CDT-svcObjWrapper-v2_7_0.xsd | 80 +++++
v2_7_0/CDT-timeSeries-v2_7_0.xsd | 6 +-
v2_7_0/CDT-timeSeriesInstance-v2_7_0.xsd | 6 +-
v2_7_0/CDT-token-v2_7_0.xsd | 4 +-
v2_7_0/CDT-trafficPattern-v2_7_0.xsd | 95 ++++++
66 files changed, 1602 insertions(+), 350 deletions(-)
create mode 100644 v2_7_0/CDT-allJoynApp-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-allJoynInterface-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-allJoynMethod-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-allJoynMethodCall-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-allJoynProperty-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-allJoynSvcObject-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-genericInterworkingOperationInstance-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-genericInterworkingService-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-svcFwWrapper-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-svcObjWrapper-v2_7_0.xsd
create mode 100644 v2_7_0/CDT-trafficPattern-v2_7_0.xsd
diff --git a/v2_7_0/CDT-AE-v2_7_0.xsd b/v2_7_0/CDT-AE-v2_7_0.xsd
index 71e3d35..eb5a58f 100644
--- a/v2_7_0/CDT-AE-v2_7_0.xsd
+++ b/v2_7_0/CDT-AE-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -34,8 +34,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-pollingChannel-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_7_0.xsd" />
- <xs:element name="AE">
+ <xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -50,6 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -62,6 +65,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:timeSeries" />
+ <xs:element ref="m2m:trafficPattern" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -70,7 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="AEAnnc">
+ <xs:element name="AEAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announced Resources -->
@@ -78,13 +84,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="appName" type="xs:string" minOccurs="0" />
- <xs:element name="App-ID" type="xs:string" />
- <xs:element name="AE-ID" type="m2m:ID" />
+ <xs:element name="App-ID" type="xs:string" minOccurs="0" />
+ <xs:element name="AE-ID" type="m2m:ID" minOccurs="0" />
<xs:element name="pointOfAccess" type="m2m:poaList" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -99,6 +106,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:scheduleAnnc" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:timeSeries" />
+ <xs:element ref="m2m:timeSeriesAnnc" />
+ <xs:element ref="m2m:trafficPatternAnnc" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
+ <xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_7_0/CDT-CSEBase-v2_7_0.xsd b/v2_7_0/CDT-CSEBase-v2_7_0.xsd
index 823ff6c..97da2d4 100644
--- a/v2_7_0/CDT-CSEBase-v2_7_0.xsd
+++ b/v2_7_0/CDT-CSEBase-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -47,7 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-role-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-token-v2_7_0.xsd" />
- <xs:element name="CSEBase">
+ <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit just the universal resource attributes -->
@@ -64,12 +64,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element>
<xs:element name="pointOfAccess" type="m2m:poaList" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" 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:remoteCSE" />
+ <xs:element ref="m2m:remoteCSEAnnc" />
<xs:element ref="m2m:node" />
<xs:element ref="m2m:AE" />
<xs:element ref="m2m:container" />
@@ -87,6 +89,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:serviceSubscribedAppRule" />
<xs:element ref="m2m:role" />
<xs:element ref="m2m:token" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_7_0/CDT-accessControlPolicy-v2_7_0.xsd b/v2_7_0/CDT-accessControlPolicy-v2_7_0.xsd
index da49899..f14dba4 100644
--- a/v2_7_0/CDT-accessControlPolicy-v2_7_0.xsd
+++ b/v2_7_0/CDT-accessControlPolicy-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd"/>
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd"/>
- <xs:element name="accessControlPolicy">
+ <xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Announceable Attributes from announceableSubordinateResource type -->
@@ -52,7 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="accessControlPolicyAnnc">
+ <xs:element name="accessControlPolicyAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Announceable Attributes from announceableSubordinateResource type -->
@@ -74,7 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <!-- m2m:setOfAcrs and m2m:accessControlRule are defined in the accessControlPolicy xsd file -->
+ <!-- m2m:setOfAcrs and m2m:accessControlRule are defined in commonTypes -->
<!-- locationRegion is defined in commonTypes -->
diff --git a/v2_7_0/CDT-activeCmdhPolicy-v2_7_0.xsd b/v2_7_0/CDT-activeCmdhPolicy-v2_7_0.xsd
index f638637..c8f0208 100644
--- a/v2_7_0/CDT-activeCmdhPolicy-v2_7_0.xsd
+++ b/v2_7_0/CDT-activeCmdhPolicy-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="activeCmdhPolicy">
+ <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from regularResourceType -->
diff --git a/v2_7_0/CDT-allJoynApp-v2_7_0.xsd b/v2_7_0/CDT-allJoynApp-v2_7_0.xsd
new file mode 100644
index 0000000..563b0fc
--- /dev/null
+++ b/v2_7_0/CDT-allJoynApp-v2_7_0.xsd
@@ -0,0 +1,82 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_7_0.xsd" />
+
+ <xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="direction" type="m2m:allJoynDirection" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynSvcObject" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="allJoynAppAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="direction" type="m2m:allJoynDirection" />
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynSvcObject" />
+ <xs:element ref="m2m:allJoynSvcObjectAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-allJoynInterface-v2_7_0.xsd b/v2_7_0/CDT-allJoynInterface-v2_7_0.xsd
new file mode 100644
index 0000000..87fbfb4
--- /dev/null
+++ b/v2_7_0/CDT-allJoynInterface-v2_7_0.xsd
@@ -0,0 +1,91 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
+
+
+ <xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="interfaceIntrospectXmlRef" type="xs:anyURI" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynMethod" />
+ <xs:element ref="m2m:allJoynProperty" />
+ <xs:element ref="m2m:container" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="allJoynInterfaceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="interfaceIntrospectXmlRef" 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="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynMethod" />
+ <xs:element ref="m2m:allJoynMethodAnnc" />
+ <xs:element ref="m2m:allJoynProperty" />
+ <xs:element ref="m2m:allJoynPropertyAnnc" />
+ <xs:element ref="m2m:container" />
+ <xs:element ref="m2m:containerAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-allJoynMethod-v2_7_0.xsd b/v2_7_0/CDT-allJoynMethod-v2_7_0.xsd
new file mode 100644
index 0000000..e958291
--- /dev/null
+++ b/v2_7_0/CDT-allJoynMethod-v2_7_0.xsd
@@ -0,0 +1,82 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_7_0.xsd" />
+
+
+ <xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynMethodCall" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="allJoynMethodAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynMethodCall" />
+ <xs:element ref="m2m:allJoynMethodCallAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-allJoynMethodCall-v2_7_0.xsd b/v2_7_0/CDT-allJoynMethodCall-v2_7_0.xsd
new file mode 100644
index 0000000..929dfaa
--- /dev/null
+++ b/v2_7_0/CDT-allJoynMethodCall-v2_7_0.xsd
@@ -0,0 +1,79 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+
+ <xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="input" type="xs:string" minOccurs="0" />
+ <xs:element name="callStatus" type="xs:string" minOccurs="0" />
+ <xs:element name="output" 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="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="allJoynMethodCallAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-allJoynProperty-v2_7_0.xsd b/v2_7_0/CDT-allJoynProperty-v2_7_0.xsd
new file mode 100644
index 0000000..81de910
--- /dev/null
+++ b/v2_7_0/CDT-allJoynProperty-v2_7_0.xsd
@@ -0,0 +1,78 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+
+ <xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="currentValue" type="xs:string" />
+ <xs:element name="requestedValue" 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="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="allJoynPropertyAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-allJoynSvcObject-v2_7_0.xsd b/v2_7_0/CDT-allJoynSvcObject-v2_7_0.xsd
new file mode 100644
index 0000000..14b0c49
--- /dev/null
+++ b/v2_7_0/CDT-allJoynSvcObject-v2_7_0.xsd
@@ -0,0 +1,84 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_7_0.xsd" />
+
+ <xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="objectPath" type="xs:string" />
+ <xs:element name="enable" type="xs:boolean" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynInterface" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="allJoynSvcObjectAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="objectPath" type="xs:string" />
+ <xs:element name="enable" type="xs:boolean" minOccurs="0" />
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynInterface" />
+ <xs:element ref="m2m:allJoynInterfaceAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-areaNwkDeviceInfo-v2_7_0.xsd b/v2_7_0/CDT-areaNwkDeviceInfo-v2_7_0.xsd
index ba4d40b..896e307 100644
--- a/v2_7_0/CDT-areaNwkDeviceInfo-v2_7_0.xsd
+++ b/v2_7_0/CDT-areaNwkDeviceInfo-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="areaNwkDeviceInfo">
+ <xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from mgmtResource -->
@@ -55,7 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="areaNwkDeviceInfoAnnc">
+ <xs:element name="areaNwkDeviceInfoAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from announcedMgmtResource -->
diff --git a/v2_7_0/CDT-areaNwkInfo-v2_7_0.xsd b/v2_7_0/CDT-areaNwkInfo-v2_7_0.xsd
index d1be1c3..15f6ad9 100644
--- a/v2_7_0/CDT-areaNwkInfo-v2_7_0.xsd
+++ b/v2_7_0/CDT-areaNwkInfo-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="areaNwkInfo">
+ <xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from mgmtResource -->
@@ -50,7 +50,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="areaNwkInfoAnnc">
+ <xs:element name="areaNwkInfoAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from announcedMgmtResource -->
diff --git a/v2_7_0/CDT-battery-v2_7_0.xsd b/v2_7_0/CDT-battery-v2_7_0.xsd
index 84c60cd..f946895 100644
--- a/v2_7_0/CDT-battery-v2_7_0.xsd
+++ b/v2_7_0/CDT-battery-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="battery">
+ <xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="batteryAnnc">
+ <xs:element name="batteryAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
diff --git a/v2_7_0/CDT-cmdhBuffer-v2_7_0.xsd b/v2_7_0/CDT-cmdhBuffer-v2_7_0.xsd
index 6e7e768..0b3d776 100644
--- a/v2_7_0/CDT-cmdhBuffer-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhBuffer-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhBuffer">
+ <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
diff --git a/v2_7_0/CDT-cmdhDefEcValue-v2_7_0.xsd b/v2_7_0/CDT-cmdhDefEcValue-v2_7_0.xsd
index 9c1311b..af4704b 100644
--- a/v2_7_0/CDT-cmdhDefEcValue-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhDefEcValue-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhDefEcValue">
+ <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
diff --git a/v2_7_0/CDT-cmdhDefaults-v2_7_0.xsd b/v2_7_0/CDT-cmdhDefaults-v2_7_0.xsd
index 3f1c8cd..379aff5 100644
--- a/v2_7_0/CDT-cmdhDefaults-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhDefaults-v2_7_0.xsd
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhDefaults">
+ <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
diff --git a/v2_7_0/CDT-cmdhEcDefParamValues-v2_7_0.xsd b/v2_7_0/CDT-cmdhEcDefParamValues-v2_7_0.xsd
index 0ea69d7..300590b 100644
--- a/v2_7_0/CDT-cmdhEcDefParamValues-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhEcDefParamValues-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhEcDefParamValues">
+ <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
diff --git a/v2_7_0/CDT-cmdhLimits-v2_7_0.xsd b/v2_7_0/CDT-cmdhLimits-v2_7_0.xsd
index 989a102..faea10c 100644
--- a/v2_7_0/CDT-cmdhLimits-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhLimits-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhLimits">
+ <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
diff --git a/v2_7_0/CDT-cmdhNetworkAccessRules-v2_7_0.xsd b/v2_7_0/CDT-cmdhNetworkAccessRules-v2_7_0.xsd
index bddc37e..249ee4a 100644
--- a/v2_7_0/CDT-cmdhNetworkAccessRules-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhNetworkAccessRules-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhNetworkAccessRules">
+ <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
diff --git a/v2_7_0/CDT-cmdhNwAccessRule-v2_7_0.xsd b/v2_7_0/CDT-cmdhNwAccessRule-v2_7_0.xsd
index be293ac..f2e1a07 100644
--- a/v2_7_0/CDT-cmdhNwAccessRule-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhNwAccessRule-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhNwAccessRule">
+ <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -39,6 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
<xs:element name="minReqVolume" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
+ <xs:element name="spreadingWaitTime" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
<xs:element name="backOffParameters" type="m2m:backOffParameters" minOccurs="1" maxOccurs="1" />
<xs:element name="otherConditions" type="xs:anyType" minOccurs="1" maxOccurs="1" />
<!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
diff --git a/v2_7_0/CDT-cmdhPolicy-v2_7_0.xsd b/v2_7_0/CDT-cmdhPolicy-v2_7_0.xsd
index 2b1480d..8464c65 100644
--- a/v2_7_0/CDT-cmdhPolicy-v2_7_0.xsd
+++ b/v2_7_0/CDT-cmdhPolicy-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="cmdhPolicy" >
+ <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
diff --git a/v2_7_0/CDT-commonTypes-v2_7_0.xsd b/v2_7_0/CDT-commonTypes-v2_7_0.xsd
index 60a6f65..f3d8325 100644
--- a/v2_7_0/CDT-commonTypes-v2_7_0.xsd
+++ b/v2_7_0/CDT-commonTypes-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -58,11 +58,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
<xs:simpleType name="roleID">
- <xs:restriction base="xs:NCName" />
+ <xs:restriction base="xs:string" >
+ <xs:pattern value="([a-zA-Z0-9\.\-,_]*)@([A-Za-z0-9\-_]*)(\.([A-Za-z0-9\-_])*)*" />
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="tokenID">
- <xs:restriction base="xs:NCName" />
+ <xs:restriction base="xs:string" >
+ <xs:pattern value="([a-zA-Z0-9\.\-,_]*)@([A-Za-z0-9\-_]*)(\.([A-Za-z0-9\-_])*)*" />
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="nhURI">
@@ -122,16 +126,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers: backoffTime, backoffTimeIncrement, maximumBackoffTime
- (in that order!), all units in milliseconds -->
- <xs:simpleType name="backOffParameters">
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="xs:nonNegativeInteger" />
- </xs:simpleType>
- <xs:length value="3" />
- </xs:restriction>
- </xs:simpleType>
<!-- ipv4 and ipv6 are defined in commonTypes -->
<!-- Initial IPv4 and IPv6 address representation types were found here:
@@ -257,6 +251,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="m2m:typeOfContent">
<xs:enumeration value="application/xml" />
<xs:enumeration value="application/json" />
+ <xs:enumeration value="application/cbor" />
</xs:restriction>
</xs:simpleType>
@@ -274,6 +269,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="contentInfo">
<xs:restriction base="xs:string">
<xs:pattern value="[\w/!#$^_.+&\-]+(:[0-2])?" />
+ <xs:pattern value="[\w/!#$^_.+&\-]+((:[0-2])?)+((:[0-5])?)" />
</xs:restriction>
</xs:simpleType>
@@ -367,25 +363,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</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:restriction base="xs:string" >
+ <xs:pattern value="([a-zA-Z0-9\-_=]+)\.([a-zA-Z0-9\-_=]*)\.([A-Za-z0-9\-_=])+" />
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="e2eCompactJWE">
- <xs:restriction base="xs:string" />
+ <xs:restriction base="xs:string" >
+ <xs:pattern value="([a-zA-Z0-9\-_=]+)\.([a-zA-Z0-9\-_=]*)\.([a-zA-Z0-9\-_=]*)\.([a-zA-Z0-9\-_=]*)\.([A-Za-z0-9\-_=])+" />
+ </xs:restriction>
</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>
@@ -442,10 +436,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
+
+<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
<xs:complexType name="primitiveContent">
- <xs:sequence>
- <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
+ <xs:any namespace="##other" processContents="lax" />
+ </xs:choice>
</xs:complexType>
<!-- m2m:batchNotify and m2m:eventNotificationCriteria are defined in the subscription resource file -->
@@ -469,10 +466,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="semanticsFilter" type="m2m:sparql" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="filterOperation" type="xs:boolean" minOccurs="0" />
+ <xs:element name="filterOperation" type="xs:boolean" minOccurs="0" />
+ <xs:element name="contentFilterSyntax" type="m2m:contentFilterSyntax" minOccurs="0" />
+ <xs:element name="contentFilterQuery" type="xs:string" minOccurs="0" />
+ <xs:element name="level" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="offset" type="xs:positiveInteger" minOccurs="0" />
</xs:sequence>
</xs:complexType>
-
+
<xs:complexType name="attribute">
<xs:sequence>
<xs:element name="name" type="xs:NCName" />
@@ -645,6 +646,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="accessControlAuthenticationFlag" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -686,6 +688,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="originatingTimestamp" 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="contentStatus" type="m2m:contentStatus" minOccurs="0" />
+ <xs:element name="contentOffset" type="xs:positiveInteger" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -755,29 +759,87 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</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">
+ <!-- m2m:securityInfo, m2m:dynAuthDasResponse and m2m:eSPrimObject are in the CDT-notification xsd file -->
+
+ <!-- m2m:listOfChildResourceRef is defined in CDT-responsePrimitive xsd file -->
+
+ <xs:complexType name="receiverESPrimRandObject">
<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:element name="esprimRandID" type="xs:NCName" />
+ <xs:element name="esprimRandValue" type="xs:NCName" />
+ <xs:element name="esprimRandExpiry" type="m2m:absRelTimestamp" />
+ <xs:element name="esprimKeyGenAlgIDs" >
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
- <xs:list itemType="m2m:roleID" />
+ <xs:list itemType="m2m:esprimKeyGenAlgID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="esprimProtocolAndAlgIDs" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:esprimProtocolAndAlgID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- This data type is used for the originatorESPrimRandObject parameter in End-to-End Security of Primitives, see TS-0003 -->
+ <xs:complexType name="originatorESPrimRandObject">
+ <xs:sequence>
+ <xs:element name="esprimRandID" type="xs:NCName" />
+ <xs:element name="esprimRandValue" type="xs:NCName" />
+ <xs:element name="esprimRandExpiry" type="m2m:absRelTimestamp" />
+ <xs:element name="esprimKeyGenAlgIDs" type="m2m:esprimKeyGenAlgID" />
+ <xs:element name="esprimProtocolAndAlgIDs" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:esprimProtocolAndAlgID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+
+ <xs:complexType name="e2eSecInfo">
+ <xs:sequence>
+ <xs:element name="supportedE2ESecFeatures" minOccurs="1" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:suid" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="certificates" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:base64Binary" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
+ <xs:element name="sharedReceiverESPrimRandObject" type="m2m:receiverESPrimRandObject" minOccurs="0" />
</xs:sequence>
</xs:complexType>
-
- <!--
- <xs:complexType name="tokenObject">
+
+ <xs:complexType name="tokenPermission">
<xs:sequence>
<xs:element name="resourceIDs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" />
@@ -794,18 +856,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</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="tokenPermissions">
+ <xs:sequence>
+ <xs:element name="permission" type="m2m:tokenPermission" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
--->
+ <xs:complexType name="tokenClaimSet">
+ <xs:sequence>
+ <xs:element name="version" type="xs:string" />
+ <xs:element name="tokenID" type="m2m:tokenID" />
+ <xs:element name="holder" type="m2m:ID" />
+ <xs:element name="issuer" type="m2m:ID" />
+ <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:element name="permissions" type="m2m:tokenPermissions" minOccurs="0" />
+ <xs:element name="extension" type="xs:string" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="dynAuthLocalTokenIdAssignments">
<xs:sequence>
@@ -836,24 +906,114 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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"/>
+ <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>
-
+ <xs:complexType name="dynAuthDasRequest">
+ <xs:sequence>
+ <xs:element name="originator" type="m2m:ID" minOccurs="1" />
+ <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="1" />
+ <xs:element name="operation" type="m2m:operation" minOccurs="1" />
+ <xs:element name="originatorIP" minOccurs="0" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" />
+ <xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" />
+ <xs:element name="originatorRoleIDs" 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:element name="requestTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="targetedResourceID" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="proposedPrivilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="roleIDsFromACPs" 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:element name="tokenIDs" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:tokenID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- initialBackoffTime, additionalBackoffTime, maximumBackoffTime in units in milliseconds -->
+ <xs:complexType name="backOffParameters">
+ <xs:sequence>
+ <xs:element name="backOffParametersSet" minOccurs="1" maxOccurs="unbounded" >
+ <complexType>
+ <sequence>
+ <xs:element name="networkAction" type="m2m:networkAction" minOccurs="0"/>
+ <xs:element name="initialBackoffTime" type="xs:nonNegativeInteger" minOccurs="1"/>
+ <xs:element name="additionalBackoffTime" type="xs:nonNegativeInteger" minOccurs="1"/>
+ <xs:element name="maximumBackoffTime" type="xs:nonNegativeInteger" minOccurs="1"/>
+ <xs:element name="optionalRandomBackoffTime" type="xs:nonNegativeInteger" minOccurs="0"/>
+ </sequence>
+ </complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- a list of dataLinks to describe persistent input/output data (as in Input/OutputDataPoint) -->
+ <!-- of services and operations, or transient data (as in operationInput/Output)of operations -->
+ <xs:complexType name="listOfDataLinks">
+ <xs:sequence>
+ <xs:element name="dataLinkEntry" type="m2m:dataLink" minOccurs="1" maxOccurs="unbounded">
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- a dataLink links (simple or complex) data specified in an ontology to their oneM2M resource -->
+ <xs:complexType name="dataLink">
+ <xs:sequence>
+
+ <!-- the name of the Input/OutputDataPoint or OperationIn-/Output as specified by the ontology -->
+ <xs:element name="name" type="xs:anyURI" />
+
+ <!-- the URL of the container/flexContainer resource for the Input/OutputDataPoint or OperationIn-/Output -->
+ <xs:element name="dataContainerID" type="m2m:ID" />
+
+ <!-- if the dataLink references simpe type data the element shall contain -->
+ <!-- a) the name of the customAttribute if URL points to a flexContainer or -->
+ <!-- b) the string "latest" if URL points to a container -->
+ <!-- if the dataLink references complex-type data (i.e. the complete resource -->
+ <!-- including customAttributes and subresources) the element is empty -->
+ <xs:element name="attributeName" type="xs:NCName" minOccurs="0" maxOccurs="1" />
+
+ </xs:sequence>
+ </xs:complexType>
<!-- 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
defined below -->
-
+
<xs:complexType name="resource">
<xs:sequence>
<xs:element name="resourceType" type="m2m:resourceType" />
@@ -980,10 +1140,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
+ <!-- Auxiliary datatype used below -->
+ <xs:simpleType name="listOfNCNames" >
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:NCName" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:complexType name="flexContainerResource">
- <xs:complexContent>
- <xs:extension base="m2m:namedResource">
<xs:sequence>
+ <xs:element name="resourceType" type="m2m:resourceType" />
+ <xs:element name="resourceID" type="m2m:ID" />
+ <xs:element name="parentID" type="m2m:nhURI" />
<xs:element name="creationTime" type="m2m:timestamp" minOccurs="0" />
<xs:element name="lastModifiedTime" type="m2m:timestamp" minOccurs="0" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" />
@@ -993,32 +1164,43 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="announcedAttribute" type="m2m:listOfNCNames" minOccurs="0" />
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
- <xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
+ </xs:sequence>
+ <xs:attribute name="resourceName" type="xs:NCName" use="required" />
</xs:complexType>
<xs:complexType name="announcedFlexContainerResource">
- <xs:complexContent>
- <xs:extension base="m2m:namedResource">
<xs:sequence>
+ <xs:element name="resourceType" type="m2m:resourceType" />
+ <xs:element name="resourceID" type="m2m:ID" />
+ <xs:element name="parentID" type="m2m:nhURI" />
<xs:element name="creationTime" type="m2m:timestamp" minOccurs="0" />
<xs:element name="lastModifiedTime" type="m2m:timestamp" minOccurs="0" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" />
- <xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
+ <xs:element name="accessControlPolicyIDs" type="m2m:acpType" />
<xs:element name="expirationTime" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="link" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="link" type="xs:anyURI" />
<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
- <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
+ </xs:sequence>
+ <xs:attribute name="resourceName" type="xs:NCName" use="required" />
</xs:complexType>
+ <!-- The following Global Elements define substitution groups -->
+ <xs:element name="sg_resource" type="m2m:resource" abstract="true" />
+ <xs:element name="sg_regularResource" type="m2m:regularResource" abstract="true" />
+ <xs:element name="sg_announcedResource" type="m2m:announcedResource" abstract="true" />
+ <xs:element name="sg_announceableResource" type="m2m:announceableResource" abstract="true"/>
+ <xs:element name="sg_subordinateResource" type="m2m:subordinateResource" abstract="true" />
+ <xs:element name="sg_announceableSubordinateResource" type="m2m:announceableSubordinateResource" abstract="true" />
+ <xs:element name="sg_announcedSubordinateResource" type="m2m:announcedSubordinateResource" abstract="true" />
+ <xs:element name="sg_mgmtResource" type="m2m:mgmtResource" abstract="true" />
+ <xs:element name="sg_announcedMgmtResource" type="m2m:announcedMgmtResource" abstract="true" />
+ <xs:element name="sg_flexContainerResource" type="m2m:flexContainerResource" abstract="true" />
+ <xs:element name="sg_announcedFlexContainerResource" type="m2m:announcedFlexContainerResource" abstract="true" />
</xs:schema>
diff --git a/v2_7_0/CDT-container-v2_7_0.xsd b/v2_7_0/CDT-container-v2_7_0.xsd
index f469a41..1e1c460 100644
--- a/v2_7_0/CDT-container-v2_7_0.xsd
+++ b/v2_7_0/CDT-container-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,8 +30,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-contentInstance-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
-
- <xs:element name="container">
+
+
+ <xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableResource">
@@ -50,8 +51,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="disableRetrieval" type="xs:boolean" 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">
@@ -59,7 +58,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:element ref="m2m:sg_flexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -68,7 +67,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="containerAnnc">
+ <xs:element name="containerAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedResource">
@@ -95,6 +94,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:containerAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
+ <xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_7_0/CDT-contentInstance-v2_7_0.xsd b/v2_7_0/CDT-contentInstance-v2_7_0.xsd
index bb1d4ab..166eb5b 100644
--- a/v2_7_0/CDT-contentInstance-v2_7_0.xsd
+++ b/v2_7_0/CDT-contentInstance-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
- <xs:element name="contentInstance">
+ <xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableSubordinateResource">
@@ -56,7 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="contentInstanceAnnc">
+ <xs:element name="contentInstanceAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedSubordinateResource">
diff --git a/v2_7_0/CDT-delivery-v2_7_0.xsd b/v2_7_0/CDT-delivery-v2_7_0.xsd
index 23f37e0..8838351 100644
--- a/v2_7_0/CDT-delivery-v2_7_0.xsd
+++ b/v2_7_0/CDT-delivery-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -31,7 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="delivery">
+ <xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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:element>
+ <xs:element ref="m2m:subscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_7_0/CDT-deviceCapability-v2_7_0.xsd b/v2_7_0/CDT-deviceCapability-v2_7_0.xsd
index b8265ff..d371906 100644
--- a/v2_7_0/CDT-deviceCapability-v2_7_0.xsd
+++ b/v2_7_0/CDT-deviceCapability-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="deviceCapability">
+ <xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from mgmtResource -->
@@ -55,7 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="deviceCapabilityAnnc">
+ <xs:element name="deviceCapabilityAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from announcedMgmtResource -->
diff --git a/v2_7_0/CDT-deviceInfo-v2_7_0.xsd b/v2_7_0/CDT-deviceInfo-v2_7_0.xsd
index 3c7e272..19d3ffd 100644
--- a/v2_7_0/CDT-deviceInfo-v2_7_0.xsd
+++ b/v2_7_0/CDT-deviceInfo-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="deviceInfo">
+ <xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from mgmtResource -->
@@ -56,7 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="deviceInfoAnnc">
+ <xs:element name="deviceInfoAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from announcedMgmtResource -->
diff --git a/v2_7_0/CDT-dynamicAuthorizationConsultation-v2_7_0.xsd b/v2_7_0/CDT-dynamicAuthorizationConsultation-v2_7_0.xsd
index a263d70..5a55bef 100644
--- a/v2_7_0/CDT-dynamicAuthorizationConsultation-v2_7_0.xsd
+++ b/v2_7_0/CDT-dynamicAuthorizationConsultation-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="dynamicAuthorizationConsultation">
+ <xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
diff --git a/v2_7_0/CDT-enumerationTypes-v2_7_0.xsd b/v2_7_0/CDT-enumerationTypes-v2_7_0.xsd
index 459a7e9..29a29b5 100644
--- a/v2_7_0/CDT-enumerationTypes-v2_7_0.xsd
+++ b/v2_7_0/CDT-enumerationTypes-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -96,12 +96,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="31" />
<!-- token -->
<xs:enumeration value="32" />
- <!-- trafficCharacteristics -->
- <xs:enumeration value="33" />
<!-- trafficPattern -->
- <xs:enumeration value="34" />
+ <xs:enumeration value="33" />
<!-- dynamicAuthorizationConsultation -->
- <xs:enumeration value="35" />
+ <xs:enumeration value="34" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -130,12 +128,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10029" />
<!-- timeSeriesInstanceAnnc -->
<xs:enumeration value="10030" />
- <!-- trafficCharacteristicsAnnc -->
- <xs:enumeration value="10033" />
<!-- trafficPatternAnnc -->
- <xs:enumeration value="10034" />
+ <xs:enumeration value="10033" />
<!-- dynamicAuthorizationConsultationAnnc -->
- <xs:enumeration value="10035" />
+ <xs:enumeration value="10034" />
</xs:restriction>
</xs:simpleType>
@@ -283,19 +279,39 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4101" />
<!-- CONTENTS_UNACCEPTABLE -->
<xs:enumeration value="4102" />
- <!-- ACCESS_DENIED -->
+ <!-- ORIGINATOR_HAS_NO_PRIVILEGE -->
<xs:enumeration value="4103" />
<!-- GROUP_REQUEST_IDENTIFIER_EXISTS -->
<xs:enumeration value="4104" />
<!-- CONFLICT -->
- <xs:enumeration value="4105" />
+ <xs:enumeration value="4105" />
+ <!-- ORIGINATOR_HAS_NOT_REGISTERED -->
+ <xs:enumeration value="4106" />
+ <!-- SECURITY_ASSOCIATION_REQUIRED -->
+ <xs:enumeration value="4107" />
+ <!-- INVALID_CHILD_RESOURCE_TYPE -->
+ <xs:enumeration value="4108" />
+ <!-- NO_MEMBERS -->
+ <xs:enumeration value="4109" />
+ <!-- GROUP_MEMBER_TYPE_INCONSISTENT -->
+ <xs:enumeration value="4110" />
+ <!-- ESPRIM_UNSUPPORTED_OPTION -->
+ <xs:enumeration value="4111" />
+ <!-- ESPRIM_UNKNOWN_KEY_ID -->
+ <xs:enumeration value="4112" />
+ <!-- GESPRIM_UNKNOWN_ORIG_RAND_ID -->
+ <xs:enumeration value="4113" />
+ <!-- ESPRIM_UNKNOWN_RECV_RAND_ID -->
+ <xs:enumeration value="4114" />
+ <!-- GESPRIM_BAD_MAC -->
+ <xs:enumeration value="4115" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
<xs:enumeration value="5001" />
<!-- TARGET_NOT_REACHABLE -->
<xs:enumeration value="5103" />
- <!-- NO_PRIVILEGE -->
+ <!-- RECEIVER_HAS_NO_PRIVILEGE -->
<xs:enumeration value="5105" />
<!-- ALREADY_EXISTS -->
<xs:enumeration value="5106" />
@@ -310,15 +326,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- NOT_ACCEPTABLE -->
<xs:enumeration value="5207" />
<!-- DISCOVERY_DENIED_BY_IPE -->
- <xs:enumeration value="5208" />
+ <xs:enumeration value="5208" />
+ <!-- GROUP_MEMBERS_NOT_RESPONDED -->
+ <xs:enumeration value="5209" />
+ <!-- ESPRIM_DECRYPTION_ERROR -->
+ <xs:enumeration value="5210" />
+ <!-- ESPRIM_ENCRYPTION_ERROR -->
+ <xs:enumeration value="5211" />
<!-- EXTERNAL_OBJECT_NOT_REACHABLE -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
<xs:enumeration value="6005" />
<!-- MAX_NUMBER_OF_MEMBER_EXCEEDED -->
<xs:enumeration value="6010" />
- <!-- MEMBER_TYPE_INCONSISTENT -->
- <xs:enumeration value="6011" />
<!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED -->
<xs:enumeration value="6020" />
<!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT -->
@@ -427,12 +447,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="31" />
<!-- token -->
<xs:enumeration value="32" />
- <!-- trafficCharacteristics -->
- <xs:enumeration value="33" />
<!-- trafficPattern -->
- <xs:enumeration value="34" />
+ <xs:enumeration value="33" />
<!-- dynamicAuthorizationConsultation -->
- <xs:enumeration value="35" />
+ <xs:enumeration value="34" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -461,12 +479,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10029" />
<!-- timeSeriesInstanceAnnc -->
<xs:enumeration value="10030" />
- <!-- trafficCharacteristicsAnnc -->
- <xs:enumeration value="10033" />
<!-- trafficPatternAnnc -->
- <xs:enumeration value="10034" />
+ <xs:enumeration value="10033" />
<!-- dynamicAuthorizationConsultationAnnc -->
- <xs:enumeration value="10035" />
+ <xs:enumeration value="10034" />
+ <!-- oldest -->
+ <xs:enumeration value="20001" />
+ <!-- latest -->
+ <xs:enumeration value="20002" />
</xs:restriction>
</xs:simpleType>
@@ -990,5 +1010,179 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- m2m:securityInfoType is defined in the CDT-notification xsd file -->
+
+ <xs:simpleType name="allJoynDirection">
+ <xs:annotation>
+ <xs:documentation>Used for direction attribute of allJoynApp resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- AllJoyn_to_oneM2M -->
+ <xs:enumeration value="1" />
+ <!-- oneM2M_to_AllJoyn -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
+
+
+ <xs:simpleType name="contentFilterSyntax">
+ <xs:annotation>
+ <xs:documentation>Used for contentFilterSyntax element in Filter Criteria primitive parameter</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- JSON_PATH_SYNTAX -->
+ <xs:enumeration value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="contentSecurity">
+ <xs:annotation>
+ <xs:documentation>Used in m2m:contentInfo</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- ESData has not been applied to the content data -->
+ <xs:enumeration value="0" />
+ <!-- ESData using JWE and/or JWS with Compact Serialization has been applied to the content data with no subsequent transfer encoding -->
+ <xs:enumeration value="1" />
+ <!-- ESData using JWE and/or JWS with JSON Serialization has been applied to the content data with no subsequent transfer encoding -->
+ <xs:enumeration value="2" />
+ <!-- ESData using JWE and/or JWS with JSON Serialization has been applied to the content data and subsequent base64 encoding (see [9]) has been applied -->
+ <xs:enumeration value="3" />
+ <!-- XML encryption and/or XML-Signature has been applied to the content data has been applied with no subsequent transfer encoding -->
+ <xs:enumeration value="4" />
+ <!-- XML encryption and/or XML-Signature has been applied to the content data and subsequent base64 encoding (see [9]) has been applied -->
+ <xs:enumeration value="5" />
+ </xs:restriction>
+ </xs:simpleType>
+
+
+ <xs:simpleType name="suid">
+ <xs:annotation>
+ <xs:documentation>Used for m2m:e2eSecInfo and other security features in TS-0003</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- pre-provisioned symmetric key intended to be shared with a MEF -->
+ <xs:enumeration value="10" />
+ <!-- pre-provisioned symmetric key intended to be shared with a MAF -->
+ <xs:enumeration value="11" />
+ <!-- pre-provisioned symmetric key intended for use in a Security Associated Establishment Framework (SAEF) -->
+ <xs:enumeration value="12" />
+ <!-- pre-provisioned symmetric key intended for use in End-to-End Security of Primitives (ESPrim) -->
+ <xs:enumeration value="13" />
+ <!-- pre-provisioned symmetric key intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt End-to-End Security of Data (ESData) Data classes -->
+ <xs:enumeration value="14" />
+ <!-- pre-provisioned symmetric key intended for use in Signature-only ESData Security Class -->
+ <xs:enumeration value="15" />
+ <!-- symmetric key, provisioned via a Remote Security Provisioning Framework (RSPF), and intended to be shared with a MAF -->
+ <xs:enumeration value="21" />
+ <!-- symmetric key, provisioned via a RSPF, and intended for use in a SAEF -->
+ <xs:enumeration value="22" />
+ <!-- symmetric key, provisioned via a RSPF, and intended for use in ESPrim -->
+ <xs:enumeration value="23" />
+ <!-- symmetric key, provisioned via a RSPF, and intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt ESData) Data classes -->
+ <xs:enumeration value="24" />
+ <!-- symmetric key, provisioned via a RSPF, and intended for use in Signature-only ESData Security Class -->
+ <xs:enumeration value="25" />
+ <!-- MAF-distributed symmetric key intended for use in a SAEF -->
+ <xs:enumeration value="32" />
+ <!-- MAF-distributed symmetric key intended for use in ESPrim -->
+ <xs:enumeration value="33" />
+ <!-- MAF-distributed symmetric key intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt ESData Data classes -->
+ <xs:enumeration value="34" />
+ <!-- MAF-distributed symmetric key intended for use in Signature-only ESData Security Class -->
+ <xs:enumeration value="35" />
+ <!-- certificate intended to be shared with a MEF -->
+ <xs:enumeration value="40" />
+ <!-- certificate intended to be shared with a MAF -->
+ <xs:enumeration value="41" />
+ <!-- certificate intended for use in a Security Associated Establishment Framework (SAEF) -->
+ <xs:enumeration value="42" />
+ <!-- certificate intended for use in End-to-End Security of Primitives (ESPrim) -->
+ <xs:enumeration value="43" />
+ <!-- certificate intended for use with authenticated encryption in the Encryption-only or Nested Sign-then-Encrypt End-to-End Security of Data (ESData) Data classes -->
+ <xs:enumeration value="44" />
+ <!-- certificate intended for use in Signature-only ESData Security Class -->
+ <xs:enumeration value="45" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="esprimKeyGenAlgID">
+ <xs:annotation>
+ <xs:documentation>Used in m2msec:receiverESPrimRandObject and m2m:originatorESPrimRandObject</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- HMAC-SHA256 -->
+ <xs:enumeration value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="esprimProtocolAndAlgID">
+ <xs:annotation>
+ <xs:documentation>Used in m2m:receiveEr2ERandObject and m2msec:originatorESPrimRandObject</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- JWE Compact Serialization with “enc†= “A128GCM†(AES GCM using 128-bit key) -->
+ <xs:enumeration value="10" />
+ <!-- JWE Compact Serialization with “enc†= “A192GCM†(AES GCM using 192-bit key} -->
+ <xs:enumeration value="11" />
+ <!-- JWE Compact Serialization with “enc†= “A256GCM†(AES GCM using 256-bit key) -->
+ <xs:enumeration value="12" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="periodicIndicator">
+ <xs:annotation>
+ <xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- Periodic -->
+ <xs:enumeration value="1" />
+ <!-- On demand -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="stationaryIndication">
+ <xs:annotation>
+ <xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- Stationary -->
+ <xs:enumeration value="1" />
+ <!-- Mobile (Moving) -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="contentStatus">
+ <xs:annotation>
+ <xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- PARTIAL_CONTENT -->
+ <xs:enumeration value="1" />
+ <!-- FULL_CONTENT -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="networkAction">
+ <xs:annotation>
+ <xs:documentation>Used in the networkAction element in the backOffParameters</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- cellular-registration -->
+ <xs:enumeration value="1" />
+ <!-- cellular-attach -->
+ <xs:enumeration value="2" />
+ <!-- cellular-pdpctxact -->
+ <xs:enumeration value="3" />
+ <!-- cellular-sms -->
+ <xs:enumeration value="4" />
+ <!-- default -->
+ <xs:enumeration value="5" />
+ </xs:restriction>
+ </xs:simpleType>
+
+
</xs:schema>
diff --git a/v2_7_0/CDT-eventConfig-v2_7_0.xsd b/v2_7_0/CDT-eventConfig-v2_7_0.xsd
index 6a56825..5520c3d 100644
--- a/v2_7_0/CDT-eventConfig-v2_7_0.xsd
+++ b/v2_7_0/CDT-eventConfig-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="eventConfig">
+ <xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-eventLog-v2_7_0.xsd b/v2_7_0/CDT-eventLog-v2_7_0.xsd
index 69f405a..d8fcdfe 100644
--- a/v2_7_0/CDT-eventLog-v2_7_0.xsd
+++ b/v2_7_0/CDT-eventLog-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="eventLog">
+ <xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -54,7 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="eventLogAnnc">
+ <xs:element name="eventLogAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
diff --git a/v2_7_0/CDT-execInstance-v2_7_0.xsd b/v2_7_0/CDT-execInstance-v2_7_0.xsd
index 2f05b01..32b169c 100644
--- a/v2_7_0/CDT-execInstance-v2_7_0.xsd
+++ b/v2_7_0/CDT-execInstance-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="execInstance">
+ <xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-firmware-v2_7_0.xsd b/v2_7_0/CDT-firmware-v2_7_0.xsd
index 32f504f..4c4260f 100644
--- a/v2_7_0/CDT-firmware-v2_7_0.xsd
+++ b/v2_7_0/CDT-firmware-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="firmware">
+ <xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -54,7 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="firmwareAnnc">
+ <xs:element name="firmwareAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
diff --git a/v2_7_0/CDT-genericInterworkingOperationInstance-v2_7_0.xsd b/v2_7_0/CDT-genericInterworkingOperationInstance-v2_7_0.xsd
new file mode 100644
index 0000000..c64b74e
--- /dev/null
+++ b/v2_7_0/CDT-genericInterworkingOperationInstance-v2_7_0.xsd
@@ -0,0 +1,90 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+
+ <xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="operationName" type="xs:string" />
+ <xs:element name="operationState" type="xs:string" />
+ <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="inputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="outputLinks" type="m2m:listOfDataLinks" 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:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+
+ <xs:element name="genericInterworkingOperationInstanceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announced Resources -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="operationName" type="xs:string" minOccurs="0" />
+ <xs:element name="operationState" type="xs:string" minOccurs="0" />
+ <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="inputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="outputLinks" type="m2m:listOfDataLinks" 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:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-genericInterworkingService-v2_7_0.xsd b/v2_7_0/CDT-genericInterworkingService-v2_7_0.xsd
new file mode 100644
index 0000000..fcd71b8
--- /dev/null
+++ b/v2_7_0/CDT-genericInterworkingService-v2_7_0.xsd
@@ -0,0 +1,88 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_7_0.xsd" />
+
+ <xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="serviceName" type="xs:string" />
+ <xs:element name="inputDataPointLinks" type="m2m:ID" minOccurs="0" />
+ <xs:element name="outputDataPointLinks" type="m2m:poaList" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:genericInterworkingService" />
+ <xs:element ref="m2m:genericInterworkingOperationInstance" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="genericInterworkingServiceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announced Resources -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="serviceName" type="xs:string" minOccurs="0" />
+ <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:genericInterworkingServiceAnnc" />
+ <xs:element ref="m2m:genericInterworkingOperationInstanceAnnc" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-group-v2_7_0.xsd b/v2_7_0/CDT-group-v2_7_0.xsd
index ab2f4b5..d000c6b 100644
--- a/v2_7_0/CDT-group-v2_7_0.xsd
+++ b/v2_7_0/CDT-group-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -31,7 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
- <xs:element name="group">
+ <xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -41,7 +41,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<!-- Resource Specific Attributes -->
<xs:element name="memberType" type="m2m:memberType" />
- <xs:element name="currentNrOfMembers" type="xs:positiveInteger" />
+ <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
<xs:element name="memberIDs" type="m2m:listOfURIs" />
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
@@ -50,9 +50,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="groupName" type="xs:string" minOccurs="0" />
<!-- Child Resources -->
- <xs:element name="fanOutPoint" type="xs:anyURI" />
- <xs:element name="semanticFanOutPoint" type="xs:anyURI" minOccurs="0" />
-
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
@@ -66,7 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="groupAnnc">
+ <xs:element name="groupAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announced Resources -->
@@ -74,16 +71,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
- <xs:element name="currentNrOfMembers" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0" />
- <xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="memberIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:list itemType="xs:anyURI" />
+ </xs:simpleType>
+ </xs:element>
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" />
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
<xs:element name="groupName" type="xs:string" minOccurs="0" />
- <!-- Child Resources -->
-
+ <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
diff --git a/v2_7_0/CDT-locationPolicy-v2_7_0.xsd b/v2_7_0/CDT-locationPolicy-v2_7_0.xsd
index a48f4b3..3fd4d22 100644
--- a/v2_7_0/CDT-locationPolicy-v2_7_0.xsd
+++ b/v2_7_0/CDT-locationPolicy-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="locationPolicy">
+ <xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -58,7 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="locationPolicyAnnc">
+ <xs:element name="locationPolicyAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announced Resources -->
diff --git a/v2_7_0/CDT-m2mServiceSubscriptionProfile-v2_7_0.xsd b/v2_7_0/CDT-m2mServiceSubscriptionProfile-v2_7_0.xsd
index 6785acf..b4cc3ea 100644
--- a/v2_7_0/CDT-m2mServiceSubscriptionProfile-v2_7_0.xsd
+++ b/v2_7_0/CDT-m2mServiceSubscriptionProfile-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_7_0.xsd" />
- <xs:element name="m2mServiceSubscriptionProfile">
+ <xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-memory-v2_7_0.xsd b/v2_7_0/CDT-memory-v2_7_0.xsd
index 8b0fdbc..d8acb3d 100644
--- a/v2_7_0/CDT-memory-v2_7_0.xsd
+++ b/v2_7_0/CDT-memory-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="memory">
+ <xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="memoryAnnc">
+ <xs:element name="memoryAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
diff --git a/v2_7_0/CDT-mgmtCmd-v2_7_0.xsd b/v2_7_0/CDT-mgmtCmd-v2_7_0.xsd
index 8fcc8a8..df3d56a 100644
--- a/v2_7_0/CDT-mgmtCmd-v2_7_0.xsd
+++ b/v2_7_0/CDT-mgmtCmd-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-execInstance-v2_7_0.xsd" />
- <xs:element name="mgmtCmd">
+ <xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-node-v2_7_0.xsd b/v2_7_0/CDT-node-v2_7_0.xsd
index e560a4e..58bc6b0 100644
--- a/v2_7_0/CDT-node-v2_7_0.xsd
+++ b/v2_7_0/CDT-node-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -42,8 +42,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_7_0.xsd" />
- <xs:element name="node">
+ <xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -71,6 +72,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:activeCmdhPolicy" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:trafficPattern" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -79,7 +81,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="nodeAnnc">
+ <xs:element name="nodeAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -106,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:trafficPatternAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_7_0/CDT-notification-v2_7_0.xsd b/v2_7_0/CDT-notification-v2_7_0.xsd
index 4b801b0..2b8b2d0 100644
--- a/v2_7_0/CDT-notification-v2_7_0.xsd
+++ b/v2_7_0/CDT-notification-v2_7_0.xsd
@@ -4,7 +4,7 @@ Copyright Notification
No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
The copyright and the foregoing restriction extend to reproduction in all media.
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -79,23 +79,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="securityInfoType" type="m2m:securityInfoType" minOccurs="0" />
<xs:element name="dasRequest" type="m2m:dynAuthDasRequest" minOccurs="0" />
<xs:element name="dasResponse" type="m2m:dynAuthDasResponse" minOccurs="0" />
- <xs:element name="e2eRandObject" type="m2m:receiverE2ERandObject" minOccurs="0" />
- <xs:element name="esprimObject" type="m2m:eSPrimObject" minOccurs="0" />
+ <xs:element name="esprimRandObject" type="m2m:receiverESPrimRandObject" minOccurs="0" />
+ <xs:element name="esprimObject" type="m2m:e2eCompactJWE" minOccurs="0" />
<xs:element name="escertkeMessage" type="xs:base64Binary" minOccurs="0" />
</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 -->
@@ -113,56 +102,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="dynAuthDasRequest">
- <xs:sequence>
- <xs:element name="originator" type="m2m:ID" minOccurs="1" />
- <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="1" />
- <xs:element name="operation" type="m2m:operation" minOccurs="1" />
- <xs:element name="originatorIP" minOccurs="0" >
- <xs:complexType>
- <xs:sequence>
- <xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" />
- <xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" />
- <xs:element name="originatorRoleIDs" 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:element name="requestTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
- <xs:element name="targetedResourceID" type="xs:anyURI" minOccurs="0" />
- <xs:element name="proposedPrivilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />
- <xs:element name="roleIDsFromACPs" 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:element name="tokenIDs" minOccurs="0" >
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="m2m:tokenID" />
- </xs:simpleType>
- <xs:minLength value="1" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
<xs:complexType name="dynAuthDasResponse">
<xs:sequence>
<xs:element name="dynamicACPInfo" minOccurs="0" >
diff --git a/v2_7_0/CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd b/v2_7_0/CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd
index 52eb612..da552c4 100644
--- a/v2_7_0/CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd
+++ b/v2_7_0/CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="notificationTargetMgmtPolicyRef">
+ <xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-notificationTargetPolicy-v2_7_0.xsd b/v2_7_0/CDT-notificationTargetPolicy-v2_7_0.xsd
index 33648ab..7ea7863 100644
--- a/v2_7_0/CDT-notificationTargetPolicy-v2_7_0.xsd
+++ b/v2_7_0/CDT-notificationTargetPolicy-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-policyDeletionRules-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="notificationTargetPolicy">
+ <xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-policyDeletionRules-v2_7_0.xsd b/v2_7_0/CDT-policyDeletionRules-v2_7_0.xsd
index ec8e795..868ed49 100644
--- a/v2_7_0/CDT-policyDeletionRules-v2_7_0.xsd
+++ b/v2_7_0/CDT-policyDeletionRules-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="policyDeletionRules">
+ <xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-pollingChannel-v2_7_0.xsd b/v2_7_0/CDT-pollingChannel-v2_7_0.xsd
index e91e2bf..bf9c402 100644
--- a/v2_7_0/CDT-pollingChannel-v2_7_0.xsd
+++ b/v2_7_0/CDT-pollingChannel-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,16 +30,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="pollingChannel">
+ <xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
<xs:extension base="m2m:subordinateResource">
<xs:sequence>
- <!-- No Resource Specific Attributes -->
-
- <!-- Virtual Child Resource -->
- <xs:element name="pollingChannelURI" type="xs:anyURI" />
+ <!-- No Resource Specific Attributes and no child resources -->
</xs:sequence>
</xs:extension>
</xs:complexContent>
diff --git a/v2_7_0/CDT-reboot-v2_7_0.xsd b/v2_7_0/CDT-reboot-v2_7_0.xsd
index 50f7ccf..ed6d647 100644
--- a/v2_7_0/CDT-reboot-v2_7_0.xsd
+++ b/v2_7_0/CDT-reboot-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="reboot">
+ <xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="rebootAnnc">
+ <xs:element name="rebootAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
diff --git a/v2_7_0/CDT-remoteCSE-v2_7_0.xsd b/v2_7_0/CDT-remoteCSE-v2_7_0.xsd
index 5ca88c8..2ae7c45 100644
--- a/v2_7_0/CDT-remoteCSE-v2_7_0.xsd
+++ b/v2_7_0/CDT-remoteCSE-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,6 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-group-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v2_7_0.xsd" />
@@ -37,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-locationPolicy-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v2_7_0.xsd" />
- <xs:element name="remoteCSE">
+ <xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -52,18 +53,29 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
+ <xs:element name="triggerReferenceNumber" type="xs:unsignedInt" 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:nodeAnnc" />
<xs:element ref="m2m:container" />
+ <xs:element ref="m2m:containerAnnc" />
<xs:element ref="m2m:group" />
+ <xs:element ref="m2m:groupAnnc" />
<xs:element ref="m2m:accessControlPolicy" />
+ <xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:timeSeries" />
+ <xs:element ref="m2m:timeSeriesAnnc" />
+ <xs:element ref="m2m:locationPolicyAnnc" />
+ <xs:element ref="m2m:AEAnnc" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
+ <xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -72,7 +84,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="remoteCSEAnnc">
+ <xs:element name="remoteCSEAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announced Resources -->
@@ -85,6 +97,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -103,6 +116,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:locationPolicyAnnc" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
+ <xs:element ref="m2m:AEAnnc" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
+ <xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_7_0/CDT-request-v2_7_0.xsd b/v2_7_0/CDT-request-v2_7_0.xsd
index 8f75ede..22ea8c7 100644
--- a/v2_7_0/CDT-request-v2_7_0.xsd
+++ b/v2_7_0/CDT-request-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="request">
+ <xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd b/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd
index 53f722a..a83d70c 100644
--- a/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd
+++ b/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
diff --git a/v2_7_0/CDT-responsePrimitive-v2_7_0.xsd b/v2_7_0/CDT-responsePrimitive-v2_7_0.xsd
index eda86fe..845b6e6 100644
--- a/v2_7_0/CDT-responsePrimitive-v2_7_0.xsd
+++ b/v2_7_0/CDT-responsePrimitive-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -98,7 +98,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Result Expiration Timestamp" -->
<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Event Category" -->
- <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
+ <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
+ <!-- parameter "Content Status" -->
+ <xs:element name="contentStatus" type="m2m:contentStatus" minOccurs="0" />
+ <!-- parameter "Content Offset" -->
+ <xs:element name="contentOffset" type="xs:positiveInteger" minOccurs="0" />
<!-- parameter "Assigned Token Identifiers -->
<xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
<!-- parameter "Token Request Information -->
@@ -115,57 +119,24 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
+ <xs:element name="resourceRefList" type="m2m:listOfChildResourceRef" />
+
+ <xs:element name="debugInfo" type="xs:string" />
+
<xs:complexType name="resourceWrapper">
<xs:sequence>
<xs:choice minOccurs="1" maxOccurs="1">
- <xs:element ref="m2m:accessControlPolicy" />
- <xs:element ref="m2m:activeCmdhPolicy" />
- <xs:element ref="m2m:AE" />
- <xs:element ref="m2m:areaNwkDeviceInfo" />
- <xs:element ref="m2m:areaNwkInfo" />
- <xs:element ref="m2m:battery" />
- <xs:element ref="m2m:cmdhBuffer" />
- <xs:element ref="m2m:cmdhDefaults" />
- <xs:element ref="m2m:cmdhDefEcValue" />
- <xs:element ref="m2m:cmdhEcDefParamValues" />
- <xs:element ref="m2m:cmdhLimits" />
- <xs:element ref="m2m:cmdhNetworkAccessRules" />
- <xs:element ref="m2m:cmdhNwAccessRule" />
- <xs:element ref="m2m:cmdhPolicy" />
- <xs:element ref="m2m:container" />
- <xs:element ref="m2m:contentInstance" />
- <xs:element ref="m2m:CSEBase" />
- <xs:element ref="m2m:delivery" />
- <xs:element ref="m2m:deviceCapability" />
- <xs:element ref="m2m:deviceInfo" />
- <xs:element ref="m2m:eventConfig" />
- <xs:element ref="m2m:eventLog" />
- <xs:element ref="m2m:execInstance" />
- <xs:element ref="m2m:firmware" />
- <xs:element ref="m2m:group" />
- <xs:element ref="m2m:locationPolicy" />
- <xs:element ref="m2m:m2mServiceSubscriptionProfile" />
- <xs:element ref="m2m:memory" />
- <xs:element ref="m2m:mgmtCmd" />
- <xs:element ref="m2m:node" />
- <xs:element ref="m2m:notification" />
- <xs:element ref="m2m:pollingChannel" />
- <xs:element ref="m2m:reboot" />
- <xs:element ref="m2m:remoteCSE" />
- <xs:element ref="m2m:request" />
- <xs:element ref="m2m:requestPrimitive" />
- <xs:element ref="m2m:responsePrimitive" />
- <xs:element ref="m2m:schedule" />
- <xs:element ref="m2m:serviceSubscribedAppRule" />
- <xs:element ref="m2m:serviceSubscribedNode" />
- <xs:element ref="m2m:software" />
- <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:element ref="m2m:sg_resource" />
+ <xs:element ref="m2m:sg_regularResource" />
+ <xs:element ref="m2m:sg_announcedResource" />
+ <xs:element ref="m2m:sg_announceableResource" />
+ <xs:element ref="m2m:sg_subordinateResource" />
+ <xs:element ref="m2m:sg_announcedSubordinateResource" />
+ <xs:element ref="m2m:sg_announceableSubordinateResource" />
+ <xs:element ref="m2m:sg_mgmtResource" />
+ <xs:element ref="m2m:sg_announcedMgmtResource" />
+ <xs:element ref="m2m:sg_flexContainerResource" />
+ <xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
<xs:element name="URI" type="xs:anyURI" />
</xs:sequence>
@@ -175,10 +146,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="aggregatedResponse">
<xs:sequence>
<xs:element name="resourceID" type="xs:anyURI" minOccurs="0"/>
- <xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element ref="m2m:responsePrimitive" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="listOfChildResourceRef">
+ <xs:sequence>
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
</xs:schema>
diff --git a/v2_7_0/CDT-role-v2_7_0.xsd b/v2_7_0/CDT-role-v2_7_0.xsd
index 3692936..616b543 100644
--- a/v2_7_0/CDT-role-v2_7_0.xsd
+++ b/v2_7_0/CDT-role-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="role">
+ <xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:regularResource">
diff --git a/v2_7_0/CDT-schedule-v2_7_0.xsd b/v2_7_0/CDT-schedule-v2_7_0.xsd
index fef1e70..c036099 100644
--- a/v2_7_0/CDT-schedule-v2_7_0.xsd
+++ b/v2_7_0/CDT-schedule-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="schedule">
+ <xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableSubordinateResource">
@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="scheduleAnnc">
+ <xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedSubordinateResource">
diff --git a/v2_7_0/CDT-semanticDescriptor-v2_7_0.xsd b/v2_7_0/CDT-semanticDescriptor-v2_7_0.xsd
index 23f14ec..842e23d 100644
--- a/v2_7_0/CDT-semanticDescriptor-v2_7_0.xsd
+++ b/v2_7_0/CDT-semanticDescriptor-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="semanticDescriptor">
+ <xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
@@ -55,7 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="semanticDescriptorAnnc">
+ <xs:element name="semanticDescriptorAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
diff --git a/v2_7_0/CDT-serviceSubscribedAppRule-v2_7_0.xsd b/v2_7_0/CDT-serviceSubscribedAppRule-v2_7_0.xsd
index 60348bd..86b9673 100644
--- a/v2_7_0/CDT-serviceSubscribedAppRule-v2_7_0.xsd
+++ b/v2_7_0/CDT-serviceSubscribedAppRule-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="serviceSubscribedAppRule">
+ <xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-serviceSubscribedNode-v2_7_0.xsd b/v2_7_0/CDT-serviceSubscribedNode-v2_7_0.xsd
index 29f477c..bf8cd3e 100644
--- a/v2_7_0/CDT-serviceSubscribedNode-v2_7_0.xsd
+++ b/v2_7_0/CDT-serviceSubscribedNode-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="serviceSubscribedNode">
+ <xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-software-v2_7_0.xsd b/v2_7_0/CDT-software-v2_7_0.xsd
index 86299c8..4900df8 100644
--- a/v2_7_0/CDT-software-v2_7_0.xsd
+++ b/v2_7_0/CDT-software-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="software">
+ <xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
@@ -58,7 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="softwareAnnc">
+ <xs:element name="softwareAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
diff --git a/v2_7_0/CDT-statsCollect-v2_7_0.xsd b/v2_7_0/CDT-statsCollect-v2_7_0.xsd
index 39ab10e..644ffdd 100644
--- a/v2_7_0/CDT-statsCollect-v2_7_0.xsd
+++ b/v2_7_0/CDT-statsCollect-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="statsCollect">
+ <xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-statsConfig-v2_7_0.xsd b/v2_7_0/CDT-statsConfig-v2_7_0.xsd
index 067a6b8..0990cc7 100644
--- a/v2_7_0/CDT-statsConfig-v2_7_0.xsd
+++ b/v2_7_0/CDT-statsConfig-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-eventConfig-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="statsConfig">
+ <xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/v2_7_0/CDT-subscription-v2_7_0.xsd b/v2_7_0/CDT-subscription-v2_7_0.xsd
index 0c7e4af..e433d57 100644
--- a/v2_7_0/CDT-subscription-v2_7_0.xsd
+++ b/v2_7_0/CDT-subscription-v2_7_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -31,7 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd" />
- <xs:element name="subscription">
+ <xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from RegularResource Type -->
diff --git a/v2_7_0/CDT-svcFwWrapper-v2_7_0.xsd b/v2_7_0/CDT-svcFwWrapper-v2_7_0.xsd
new file mode 100644
index 0000000..a08a1ac
--- /dev/null
+++ b/v2_7_0/CDT-svcFwWrapper-v2_7_0.xsd
@@ -0,0 +1,77 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+
+ <xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="svcFwWrapperAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-svcObjWrapper-v2_7_0.xsd b/v2_7_0/CDT-svcObjWrapper-v2_7_0.xsd
new file mode 100644
index 0000000..bd3602e
--- /dev/null
+++ b/v2_7_0/CDT-svcObjWrapper-v2_7_0.xsd
@@ -0,0 +1,80 @@
+<?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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_7_0.xsd" />
+
+ <xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to flexContainer specializations -->
+ <xs:extension base="m2m:flexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynApp" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="svcObjWrapperAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit attributes common to announced flexContainer specializations -->
+ <xs:extension base="m2m:announcedFlexContainerResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ <xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:allJoynAppAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_7_0/CDT-timeSeries-v2_7_0.xsd b/v2_7_0/CDT-timeSeries-v2_7_0.xsd
index 1d9bd0c..dd6e2b4 100644
--- a/v2_7_0/CDT-timeSeries-v2_7_0.xsd
+++ b/v2_7_0/CDT-timeSeries-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -32,7 +32,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
- <xs:element name="timeSeries">
+ <xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableResource">
@@ -71,7 +71,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="timeSeriesAnnc">
+ <xs:element name="timeSeriesAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedResource">
diff --git a/v2_7_0/CDT-timeSeriesInstance-v2_7_0.xsd b/v2_7_0/CDT-timeSeriesInstance-v2_7_0.xsd
index 2f4642f..f145ffe 100644
--- a/v2_7_0/CDT-timeSeriesInstance-v2_7_0.xsd
+++ b/v2_7_0/CDT-timeSeriesInstance-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
- <xs:element name="timeSeriesInstance">
+ <xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableSubordinateResource">
@@ -46,7 +46,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="timeSeriesInstanceAnnc">
+ <xs:element name="timeSeriesInstanceAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedSubordinateResource">
diff --git a/v2_7_0/CDT-token-v2_7_0.xsd b/v2_7_0/CDT-token-v2_7_0.xsd
index 9b71d2c..2b0b001 100644
--- a/v2_7_0/CDT-token-v2_7_0.xsd
+++ b/v2_7_0/CDT-token-v2_7_0.xsd
@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
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.
+© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
- <xs:element name="token">
+ <xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:regularResource">
diff --git a/v2_7_0/CDT-trafficPattern-v2_7_0.xsd b/v2_7_0/CDT-trafficPattern-v2_7_0.xsd
new file mode 100644
index 0000000..180f969
--- /dev/null
+++ b/v2_7_0/CDT-trafficPattern-v2_7_0.xsd
@@ -0,0 +1,95 @@
+<?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.
+© 2016, 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 xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
+ attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
+
+ <xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes -->
+ <xs:extension base="m2m:announceableResource">
+
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="provideToNSE" type="xs:boolean" minOccurs="0" maxOccurs="1" />
+ <xs:element name="periodicIndicator" type="m2m:periodicIndicator" minOccurs="0" maxOccurs="1" />
+ <xs:element name="periodicDurationTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
+ <xs:element name="periodicIntervalTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
+ <xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" maxOccurs="1" />
+ <xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" maxOccurs="1" />
+ <xs:element name="validityTime" type="m2m:timestamp" minOccurs="0" maxOccurs="1" />
+ <xs:element name="targetNetwork" type="m2m:listOfM2MID" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element ref="m2m:schedule" minOccurs="0" maxOccurs="1" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="trafficPatternAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes -->
+ <xs:extension base="m2m:announcedResource">
+
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="provideToNSE" type="xs:boolean" minOccurs="0" maxOccurs="1" />
+ <xs:element name="periodicIndicator" type="m2m:periodicIndicator" minOccurs="0" maxOccurs="1" />
+ <xs:element name="periodicDurationTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
+ <xs:element name="periodicIntervalTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
+ <xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" maxOccurs="1" />
+ <xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" maxOccurs="1" />
+ <xs:element name="validityTime" type="m2m:timestamp" minOccurs="0" maxOccurs="1" />
+ <xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="0" maxOccurs="1" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element ref="m2m:scheduleAnnc" minOccurs="0" maxOccurs="1" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
--
GitLab