diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd
index 0c76e5d30497f4e783442f52664f4e8e862201e2..8faf7c4f766c4340e987db3b830dafbca3cf6520 100644
--- a/CDT-enumerationTypes-v0_8_0.xsd
+++ b/CDT-enumerationTypes-v0_8_0.xsd
@@ -729,4 +729,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
+
+ <!-- TODO: Agree representation of SRole-ID and add to TS-0004 -->
+ <xs:simpleType name="SRole-ID">
+ <xs:restriction base="xs:token">
+ <!-- Software Management -->
+ <xs:enumeration value="01-001" />
+ <!-- Device Configuration -->
+ <xs:enumeration value="02-001" />
+ <!-- Device Diagnostics and Management -->
+ <xs:enumeration value="02-002" />
+ <!-- Device Firmware Management -->
+ <xs:enumeration value="02-003" />
+ <!-- Device Topology -->
+ <xs:enumeration value="02-004" />
+ <!-- Location -->
+ <xs:enumeration value="03-001" />
+ <!-- Basic Data -->
+ <xs:enumeration value="04-001" />
+ <!-- Onboarding -->
+ <xs:enumeration value="05-001" />
+ <!-- Security Administration -->
+ <xs:enumeration value="06-001" />
+ <!-- Groups Management -->
+ <xs:enumeration value="07-001" />
+ <!-- Event Collection -->
+ <xs:enumeration value="08-001" />
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
+
diff --git a/CDT-execInstance-v0_8_0.xsd b/CDT-execInstance-v0_8_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..3172f9468867f5a10eecb555447e028796b2755b
--- /dev/null
+++ b/CDT-execInstance-v0_8_0.xsd
@@ -0,0 +1,63 @@
+<?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.
+© 2014, 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+
+ <xs:element name="execInstance">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+
+ <!-- TODO: in TS-0004 7.2.16 this is called m2m:execStatusType, but in the enums it is called execStateType -->
+ <xs:element name="execStatus" type="m2m:execStateType" />
+ <xs:element name="execResult" type="m2m:execResultType" />
+
+ <!-- TODO: in TS-0004 7.2.16 this is shown as xs:string, but the text suggests that it is a URI -->
+ <xs:element name="execDisable" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="execTarget" type="m2m:nodeID" />
+ <xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
+ <xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
+ <xs:element name="execDelay" type="xs:duration" minOccurs="0" />
+ <xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-m2mServiceSubscriptionProfile-v0_8_0.xsd b/CDT-m2mServiceSubscriptionProfile-v0_8_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..41ea089d236184a1f87697d01d60c729feed33b9
--- /dev/null
+++ b/CDT-m2mServiceSubscriptionProfile-v0_8_0.xsd
@@ -0,0 +1,60 @@
+<?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.
+© 2014, 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+
+ <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v0_8_0.xsd" />
+
+ <xs:element name="m2mServiceSubscriptionProfile">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="serviceRoles" minOccurs="0">
+ <xs:simpleType>
+ <xs:list itemType="m2m:SRole-ID" />
+ </xs:simpleType>
+ </xs:element>
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:serviceSubscribedNode" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-mgmtCmd-v0_8_0.xsd b/CDT-mgmtCmd-v0_8_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..8e1835ba32d30ca5342e0f0fa6e35bca86dd9b9d
--- /dev/null
+++ b/CDT-mgmtCmd-v0_8_0.xsd
@@ -0,0 +1,64 @@
+<?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.
+© 2014, 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+
+ <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v0_8_0.xsd" />
+
+ <xs:element name="mgmtCmd">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="description" type="xs:string" minOccurs="0" />
+ <xs:element name="cmdType" type="m2m:cmdType" />
+ <xs:element name="execReqType" type="m2m:execReqArgsListType" minOccurs="0" />
+ <xs:element name="execEnable" type="xs:anyURI" />
+ <xs:element name="execTarget" type="m2m:nodeID" />
+ <xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
+ <xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
+ <xs:element name="execDelay" type="xs:duration" minOccurs="0" />
+ <xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="1" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:sequence>
+ <xs:element ref="m2m:execInstance"/>
+ <xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/README.md b/README.md
index 3fcec83929335fa80f40193b45c1baae5fccef72..8c720d43e98384abb40379a893aacaa01c0eebd7 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,13 @@ General
m2m:resourceTypeList can be removed, since this type can be declared inline
+\<execInstance\>
+
+ It isn't clear what the type of execDisable ought to be, as it isn't obvious what the cancellation mechanism is. TS-0001 says "The UPDATE request shall address the execDisable attribute with a predefined value in order to trigger the CANCEL action" i.e. you trigger a cancellation by writing a "predefined value" to this attribute, but doesn't say what that value is. We could achieve that by making it xs:boolean or by making it a string with two permitted values (e.g. "" and "CANCEL"). On the other hand TS-0004 says "Cancel operation is triggered by an Update primitive, if the primitive addresses the execDisable attribute or the URI provided as the value of the execDisable". This suggests that execDisable should be xs:anyURI and that triggering is cancelled either by writing a new URI into it, or by sending an Update to the URI that it already contains. The corresponding execEnable attribute in \<mgmtCmd\> has type xs:anyURI.
+
+ In TS-0004 7.2.16 the execStatus attribute has type m2m:execStatusType, but in the enums clause the type is called m2m:execStateType
+
+
\<group\>
The order in which the attributes appear is different between TS-0001 and TS-0004 (also TS-0004 should say creator not Creator)
@@ -46,7 +53,8 @@ General
CDT-enumerationTypes
Add or update definitions of the following types:
- resultContent, statusCode, requestStatus, attribute, notificationCongestionPolicy
+ resultContent, statusCode, requestStatus, notificationCongestionPolicy, SRole-ID
+ Decide how to represent the attribute attribute
Does m2m:memberType need to be different from m2m:resourceType? Can we remove it?
Sort out the two m2m:operation types
Should have a better name for listOfBoolean (it isn't a list)