diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index 388970d64b5b9d78b5e30a725bb35f4f03fb14c3..7349d96e7cfb31c6f91648419e7a633164d98432 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.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.xsd" />
<xs:include schemaLocation="CDT-schedule.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern.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/CDT-CSEBase.xsd b/CDT-CSEBase.xsd
index 84559b03268722885889f19833b67326f908efc7..31e55973a65e23c1e6999a874dc5ca255e39492f 100644
--- a/CDT-CSEBase.xsd
+++ b/CDT-CSEBase.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.xsd" />
<xs:include schemaLocation="CDT-token.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/CDT-accessControlPolicy.xsd b/CDT-accessControlPolicy.xsd
index 3b920a5b13da50e846c27080c99e2f9b9496d240..55b62933e9c2cd0c3ec92a2a9767d6a3f08fb5e6 100644
--- a/CDT-accessControlPolicy.xsd
+++ b/CDT-accessControlPolicy.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.xsd"/>
<xs:include schemaLocation="CDT-subscription.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/CDT-activeCmdhPolicy.xsd b/CDT-activeCmdhPolicy.xsd
index 3083aef175809dae810315e9f93420787d3be821..aff0a000c2f22470ec7e2ce1623ad4547053141e 100644
--- a/CDT-activeCmdhPolicy.xsd
+++ b/CDT-activeCmdhPolicy.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.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/CDT-allJoynApp.xsd b/CDT-allJoynApp.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..68fef068ce8eeb4bdc6ede8324aac56515e89183
--- /dev/null
+++ b/CDT-allJoynApp.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject.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/CDT-allJoynInterface.xsd b/CDT-allJoynInterface.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..2114430c973733144dd9f1e006befc0911d5561c
--- /dev/null
+++ b/CDT-allJoynInterface.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty.xsd" />
+ <xs:include schemaLocation="CDT-container.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/CDT-allJoynMethod.xsd b/CDT-allJoynMethod.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..d8f229128dcbafdb62e6b9614d7bdcff9310ff8e
--- /dev/null
+++ b/CDT-allJoynMethod.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall.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/CDT-allJoynMethodCall.xsd b/CDT-allJoynMethodCall.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..19153eab6015fbd685d734f0b950747a0522fad3
--- /dev/null
+++ b/CDT-allJoynMethodCall.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.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/CDT-allJoynProperty.xsd b/CDT-allJoynProperty.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..ddf0ba6d8e3f73cb62af2af92e0e351cd86b70ea
--- /dev/null
+++ b/CDT-allJoynProperty.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.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/CDT-allJoynSvcObject.xsd b/CDT-allJoynSvcObject.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..ea2cda6d00e9d79fb6d54d5d1c77f737798bf5a0
--- /dev/null
+++ b/CDT-allJoynSvcObject.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface.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/CDT-areaNwkDeviceInfo.xsd b/CDT-areaNwkDeviceInfo.xsd
index 899951aec1efe88c59fca35e0abe406fbc229753..de80a75e457956395deea8f30ac5123d883aa3c8 100644
--- a/CDT-areaNwkDeviceInfo.xsd
+++ b/CDT-areaNwkDeviceInfo.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-areaNwkInfo.xsd b/CDT-areaNwkInfo.xsd
index d3bb4076dd95ef9aeab3e17fb4d8449fb4f3487c..5cd5c19a7d20ebb8a05f5583111958e0c1142f65 100644
--- a/CDT-areaNwkInfo.xsd
+++ b/CDT-areaNwkInfo.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-battery.xsd b/CDT-battery.xsd
index 3bc621b85365772d93105f17de16178cee71921c..d5fdb11e5e3869dc66bd4c2841fd5d1ce55a04b8 100644
--- a/CDT-battery.xsd
+++ b/CDT-battery.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-cmdhBuffer.xsd b/CDT-cmdhBuffer.xsd
index 33dba5ae0336ead70dcb46722125bfcfd4b636cb..98b71e86a959f4b6706ba1e96d0c3d3ab5115ae0 100644
--- a/CDT-cmdhBuffer.xsd
+++ b/CDT-cmdhBuffer.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.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/CDT-cmdhDefEcValue.xsd b/CDT-cmdhDefEcValue.xsd
index a3acd9f236d7c30657f319fe80e936db2c6cdf2f..b5062ca811c8ae0e65dab1c2b135d8fba7a211d0 100644
--- a/CDT-cmdhDefEcValue.xsd
+++ b/CDT-cmdhDefEcValue.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.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/CDT-cmdhDefaults.xsd b/CDT-cmdhDefaults.xsd
index dcd9220a7f462c3905124a0493c44b2e835910da..4aee6518bc36b895bc594b55cc721ad128d7e2be 100644
--- a/CDT-cmdhDefaults.xsd
+++ b/CDT-cmdhDefaults.xsd
@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes.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/CDT-cmdhEcDefParamValues.xsd b/CDT-cmdhEcDefParamValues.xsd
index 0000e5f517f6a3315116ee4bb8853001586322a7..1eb76ac82c02691b72269c6010fe2cf2841cee31 100644
--- a/CDT-cmdhEcDefParamValues.xsd
+++ b/CDT-cmdhEcDefParamValues.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.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/CDT-cmdhLimits.xsd b/CDT-cmdhLimits.xsd
index e7e4e76ad220312fbd11ab1e5a85e4ebec4fcfdc..b8d9264b745114f9b02592684717a7582e0f6ecd 100644
--- a/CDT-cmdhLimits.xsd
+++ b/CDT-cmdhLimits.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.xsd" />
- <xs:element name="cmdhLimits">
+ <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
diff --git a/CDT-cmdhNetworkAccessRules.xsd b/CDT-cmdhNetworkAccessRules.xsd
index aa9ddc16970bb9a9c3d196fd6625ee72d1d6d2a0..95161f4ffd930c1ebc257e5629055bc93ef97993 100644
--- a/CDT-cmdhNetworkAccessRules.xsd
+++ b/CDT-cmdhNetworkAccessRules.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.xsd" />
- <xs:element name="cmdhNetworkAccessRules">
+ <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
diff --git a/CDT-cmdhNwAccessRule.xsd b/CDT-cmdhNwAccessRule.xsd
index d0cc7d14886c902a852d5348000dd7a23322a004..d93dea2650f9217afe6d8d357b2077a91390f2ae 100644
--- a/CDT-cmdhNwAccessRule.xsd
+++ b/CDT-cmdhNwAccessRule.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.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/CDT-cmdhPolicy.xsd b/CDT-cmdhPolicy.xsd
index b00a4da55c19bbff263e5e37efe352c321a8f53a..1aa5cb260edcf3b9b6d54ec11a68e082afee91e3 100644
--- a/CDT-cmdhPolicy.xsd
+++ b/CDT-cmdhPolicy.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.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/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index eb40c7b4fd3b4b9d4de6e0920b324424e20446b5..62de95a8f979e80e42ded10d233bfcb9409b53ea 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.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,27 +1140,67 @@ 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:announceableResource">
<xs:sequence>
- <xs:element name="containerDefinition" type="xs:anyURI" />
+ <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="expirationTime" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
+ <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="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:announcedResource">
<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" />
+ <xs:element name="expirationTime" type="m2m:timestamp" 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" 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/CDT-container.xsd b/CDT-container.xsd
index 6c411ac9b4311d8852e7ad59e0db7ff4728ed2b1..78aa3afe8c6f842cc500360f5e08179ca883efb4 100644
--- a/CDT-container.xsd
+++ b/CDT-container.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.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/CDT-contentInstance.xsd b/CDT-contentInstance.xsd
index b8f59b9c093501f878d7a4638abf46d08eb3b610..611dfce7817952946ef5d2ae50d8d9ccd0496786 100644
--- a/CDT-contentInstance.xsd
+++ b/CDT-contentInstance.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.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.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/CDT-delivery.xsd b/CDT-delivery.xsd
index 06664bca61b9622beaa1311c210b9820ee01a0eb..f5e8bc9572d9ebd0e531f2a551c650d726a38b62 100644
--- a/CDT-delivery.xsd
+++ b/CDT-delivery.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.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/CDT-deviceCapability.xsd b/CDT-deviceCapability.xsd
index ba02de89b7ffd261d8f1c19a007138cc8d528ef4..105c3362fa56cefee1fd4b3cd7403d5b638a7644 100644
--- a/CDT-deviceCapability.xsd
+++ b/CDT-deviceCapability.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-deviceInfo.xsd b/CDT-deviceInfo.xsd
index 77685961ec12a9c66ff7a8629ab61bf4ad9ae3f5..b411bba73cc9bcd43a14bb4cce080b047c65be4e 100644
--- a/CDT-deviceInfo.xsd
+++ b/CDT-deviceInfo.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-dynamicAuthorizationConsultation.xsd b/CDT-dynamicAuthorizationConsultation.xsd
index f3840c2c27fbe836072b0c88244a24a6b0d2e556..c2728c832e53f9b98bb8dca9889aabbf0aa1404b 100644
--- a/CDT-dynamicAuthorizationConsultation.xsd
+++ b/CDT-dynamicAuthorizationConsultation.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.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/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 459a7e94b6a861375c7bded0bb19ba83ed18a11a..29a29b53fbfb644dfb1084dd18cdf1b08adbc1ce 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.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/CDT-eventConfig.xsd b/CDT-eventConfig.xsd
index 5528a580607bc35f3b7eca5c67a4c82e4a0a08fb..1544e1f668be57e36dab1d3b73e6a4ecc99a188e 100644
--- a/CDT-eventConfig.xsd
+++ b/CDT-eventConfig.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="eventConfig">
+ <xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-eventLog.xsd b/CDT-eventLog.xsd
index 93cf6636f313fc4c95f2f961f7b1f46c463493f1..3b728363c42c3de6d92ba68758a8a404bf080b2a 100644
--- a/CDT-eventLog.xsd
+++ b/CDT-eventLog.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-execInstance.xsd b/CDT-execInstance.xsd
index 458c4487f59f2a5772f8c03e30738a153ac2b001..3792ca5fcdef74359727f13855dfe669d32b62ef 100644
--- a/CDT-execInstance.xsd
+++ b/CDT-execInstance.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="execInstance">
+ <xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-firmware.xsd b/CDT-firmware.xsd
index 3e6ed3ec471714f9f1a4eeabc39844ff18679ae6..f15c303fb43d493b3d7ddba45f449b1dda90d83a 100644
--- a/CDT-firmware.xsd
+++ b/CDT-firmware.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-genericInterworkingOperationInstance.xsd b/CDT-genericInterworkingOperationInstance.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..17c1454573477705d9647ca0be50942e245bfece
--- /dev/null
+++ b/CDT-genericInterworkingOperationInstance.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.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/CDT-genericInterworkingService.xsd b/CDT-genericInterworkingService.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..2a1335d8c767a5979004d8dd5b5d7c1548181705
--- /dev/null
+++ b/CDT-genericInterworkingService.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance.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/CDT-group.xsd b/CDT-group.xsd
index c8944bb37c7fd47cbcd8ae0668ab64229d71e8df..953defcea3e31549eee737843667ae65f6bbd9c9 100644
--- a/CDT-group.xsd
+++ b/CDT-group.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.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.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/CDT-locationPolicy.xsd b/CDT-locationPolicy.xsd
index 5d26dab4fda3baa31c92febbc03e2e386d5c965d..2e24ff1aa6f4cc6ef2a696083db0309744a12ecd 100644
--- a/CDT-locationPolicy.xsd
+++ b/CDT-locationPolicy.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-m2mServiceSubscriptionProfile.xsd b/CDT-m2mServiceSubscriptionProfile.xsd
index 8e3d27b3e3ed540e1e91d9597caa5502e7bc259b..633ee549d9af7c374aa691b284a25f3459a3f299 100644
--- a/CDT-m2mServiceSubscriptionProfile.xsd
+++ b/CDT-m2mServiceSubscriptionProfile.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.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedNode.xsd" />
- <xs:element name="m2mServiceSubscriptionProfile">
+ <xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-memory.xsd b/CDT-memory.xsd
index bb15e47d0966827d2c56410a1f45d591ab9c6cf5..6c73a44d4e2fc14ba2de988fcc3c72e7d3b666f8 100644
--- a/CDT-memory.xsd
+++ b/CDT-memory.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-mgmtCmd.xsd b/CDT-mgmtCmd.xsd
index bd2956de2c57039456a234a37c228b4ff5893804..12624d0ab1662a7fef1cd5bc0471298e24f923a7 100644
--- a/CDT-mgmtCmd.xsd
+++ b/CDT-mgmtCmd.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.xsd" />
<xs:include schemaLocation="CDT-execInstance.xsd" />
- <xs:element name="mgmtCmd">
+ <xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-node.xsd b/CDT-node.xsd
index 70f66deb6fd59cfedee693a71e751d3d8b5addf0..9c498e712e3e0edcca9706fc9a566c61a624a2fa 100644
--- a/CDT-node.xsd
+++ b/CDT-node.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern.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/CDT-notification.xsd b/CDT-notification.xsd
index 6ac3846b8aae6b923f11a8b6958aa143280f9e80..777a37604aa7c7abcab31846d9f628ebdb394bf9 100644
--- a/CDT-notification.xsd
+++ b/CDT-notification.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/CDT-notificationTargetMgmtPolicyRef.xsd b/CDT-notificationTargetMgmtPolicyRef.xsd
index 4cd10a0f5eb91b075ed6752c429e2a7a54e33d86..58eea2c23ef2d573c112c83fe70c6b4b883f2ebe 100644
--- a/CDT-notificationTargetMgmtPolicyRef.xsd
+++ b/CDT-notificationTargetMgmtPolicyRef.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="notificationTargetMgmtPolicyRef">
+ <xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-notificationTargetPolicy.xsd b/CDT-notificationTargetPolicy.xsd
index ecf2eb2427583e93a2453f5a6994124aea7d84c0..5908c98087fc212b6ac023d8827e0003bde0a797 100644
--- a/CDT-notificationTargetPolicy.xsd
+++ b/CDT-notificationTargetPolicy.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="notificationTargetPolicy">
+ <xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-policyDeletionRules.xsd b/CDT-policyDeletionRules.xsd
index b45ce3ec6656473d4c46bb8e238975c45e49e572..2e22753bcd7fe209edf15cb4b9d9d3948597b9a6 100644
--- a/CDT-policyDeletionRules.xsd
+++ b/CDT-policyDeletionRules.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="policyDeletionRules">
+ <xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-pollingChannel.xsd b/CDT-pollingChannel.xsd
index dd6b49893c98c06de30b503ad0e852c28fffe716..d2a07b0d63207c584f18996df84149ecdc1b08a5 100644
--- a/CDT-pollingChannel.xsd
+++ b/CDT-pollingChannel.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-reboot.xsd b/CDT-reboot.xsd
index b222bdaa58a6b5d5f4d56562de661dca8e73e629..5a68787bd0f9dd4b41a61b27e116ef0ad2074e4c 100644
--- a/CDT-reboot.xsd
+++ b/CDT-reboot.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index 90fbdaa3b02a3a50efdc3ed25badec39806c7624..44a2943c3e6a16e4d8eddeaf3dd2b67cd476a0a4 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.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.xsd" />
+ <xs:include schemaLocation="CDT-AE.xsd" />
<xs:include schemaLocation="CDT-container.xsd" />
<xs:include schemaLocation="CDT-group.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy.xsd" />
@@ -37,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-locationPolicy.xsd" />
<xs:include schemaLocation="CDT-timeSeries.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/CDT-request.xsd b/CDT-request.xsd
index f99a9600c94ae4032c67685cfc813f4876d89577..cfaafd108eabac4b7770ebfb9c0343c8c95f6d58 100644
--- a/CDT-request.xsd
+++ b/CDT-request.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="request">
+ <xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index 207e68022850a87112663ae325f40a5be937db28..30671eccffe49ce552ca3c323e98effad8b7b635 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.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,81 +28,81 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes.xsd" />
-
- <xs:element name="requestPrimitive" >
- <xs:complexType>
- <xs:sequence>
- <!-- parameter "Operation" -->
- <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
- <!-- parameter "To" -->
- <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
- <!-- parameter "From" -->
- <xs:element name="from" type="m2m:ID" minOccurs="0"/>
- <!-- parameter "Request Identifier" -->
- <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
- <!-- parameter "ResourceType" -->
- <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
- <!-- parameter "Content" -->
- <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
- <!-- parameter "Role IDs" -->
- <xs:element name="roleIDs" minOccurs="0">
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="m2m:roleID" />
- </xs:simpleType>
- <xs:minLength value="1" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
-
- <!-- parameter "Originating Timestamp" -->
- <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Request Expiration Timestamp" -->
- <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
- <!-- parameter "Result Expiration Timestamp" -->
- <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
- <!-- parameter "Operation Execution Time" -->
- <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0"/>
- <!-- parameter "Response Type" -->
- <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
- <!-- parameter "Result Persistence" -->
- <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
- <!-- parameter "Result Content" -->
- <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
- <!-- parameter "Event Category" -->
- <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
- <!-- parameter "Delivery Aggregation" -->
- <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
- <!-- parameter "Group Request Identifier" -->
- <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>
- <!-- parameter "Filter Criteria" -->
- <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
- <!-- parameter "Discovery Result Type" -->
- <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
- <!-- parameter "Tokens" -->
- <xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/>
- <!-- parameter "Token IDs" -->
- <xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>
- <!-- parameter "Local Token IDs" -->
- <xs:element name="localTokenIDs" minOccurs="0">
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="xs:NCName" />
- </xs:simpleType>
- <xs:minLength value="1" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <!-- parameter "Token Request Indicator" -->
- <xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+
+ <xs:element name="requestPrimitive" >
+ <xs:complexType>
+ <xs:sequence>
+ <!-- parameter "Operation" -->
+ <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
+ <!-- parameter "To" -->
+ <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
+ <!-- parameter "From" -->
+ <xs:element name="from" type="m2m:ID" minOccurs="0"/>
+ <!-- parameter "Request Identifier" -->
+ <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
+ <!-- parameter "ResourceType" -->
+ <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
+ <!-- parameter "Content" -->
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
+ <!-- parameter "Role IDs" -->
+ <xs:element name="roleIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <!-- parameter "Originating Timestamp" -->
+ <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Request Expiration Timestamp" -->
+ <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
+ <!-- parameter "Result Expiration Timestamp" -->
+ <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
+ <!-- parameter "Operation Execution Time" -->
+ <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0"/>
+ <!-- parameter "Response Type" -->
+ <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
+ <!-- parameter "Result Persistence" -->
+ <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
+ <!-- parameter "Result Content" -->
+ <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
+ <!-- parameter "Event Category" -->
+ <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
+ <!-- parameter "Delivery Aggregation" -->
+ <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
+ <!-- parameter "Group Request Identifier" -->
+ <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>
+ <!-- parameter "Filter Criteria" -->
+ <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
+ <!-- parameter "Discovery Result Type" -->
+ <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
+ <!-- parameter "Tokens" -->
+ <xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/>
+ <!-- parameter "Token IDs" -->
+ <xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>
+ <!-- parameter "Local Token IDs" -->
+ <xs:element name="localTokenIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:NCName" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <!-- parameter "Token Request Indicator" -->
+ <xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
- <xs:element name="attributeList" type="m2m:attributeList" />
+ <xs:element name="attributeList" type="m2m:attributeList" />
</xs:schema>
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index c44127ece14e032485ce845ed9c684c26a418d1d..d80afbb32372892246bdc7833c3f66a98a3246b3 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.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/CDT-role.xsd b/CDT-role.xsd
index 7e1b1f9fecb8c2c1e57be125576fdc21f00504be..008b6562d5dc235d61df37b784cd42bd9e829015 100644
--- a/CDT-role.xsd
+++ b/CDT-role.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.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/CDT-schedule.xsd b/CDT-schedule.xsd
index 0825e38136e3c7ad3d72f039ec307970f3883c94..632dcf94dd8f4a314c93268c010962e48f2eea37 100644
--- a/CDT-schedule.xsd
+++ b/CDT-schedule.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-semanticDescriptor.xsd b/CDT-semanticDescriptor.xsd
index 410b08010c285a3619749c0814fc21032a6bdb45..369c188f1b1e744b96d7411ffa3c45f9371fbb53 100644
--- a/CDT-semanticDescriptor.xsd
+++ b/CDT-semanticDescriptor.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-serviceSubscribedAppRule.xsd b/CDT-serviceSubscribedAppRule.xsd
index f2d5dc1b973e8b6944b3428498a982918649f00d..90ffe6265434b4272c32a18f361ed7348446501d 100644
--- a/CDT-serviceSubscribedAppRule.xsd
+++ b/CDT-serviceSubscribedAppRule.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="serviceSubscribedAppRule">
+ <xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-serviceSubscribedNode.xsd b/CDT-serviceSubscribedNode.xsd
index bcc1ff9cd3f51847cdfac8d6e9ae8a49446ededa..a5fbd0f858a57e29ffa9b31afe0328ea7995b34d 100644
--- a/CDT-serviceSubscribedNode.xsd
+++ b/CDT-serviceSubscribedNode.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="serviceSubscribedNode">
+ <xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-software.xsd b/CDT-software.xsd
index df8cd2ec7f5d0f02b4b71182e3e407f07b85a24b..2fb6047988abcf9ab110a89433b1978982b6b8a8 100644
--- a/CDT-software.xsd
+++ b/CDT-software.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.xsd" />
<xs:include schemaLocation="CDT-subscription.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/CDT-statsCollect.xsd b/CDT-statsCollect.xsd
index f7287b142176db1e01f1f65f9e4f601bd0b9c86c..8e0a37936fad9601a43ddd868a8980abada1fc70 100644
--- a/CDT-statsCollect.xsd
+++ b/CDT-statsCollect.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="statsCollect">
+ <xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-statsConfig.xsd b/CDT-statsConfig.xsd
index e9fe68c5745e6b983cbe8a4cec33e9a34af28159..b4fded90aa20edd2a2b0b0b078e63927e47acff2 100644
--- a/CDT-statsConfig.xsd
+++ b/CDT-statsConfig.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.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="statsConfig">
+ <xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 7cdb5611c3771c80ec590307a4d5a5274a5b5e8a..cc040a8245a2cb0c1b2f5f433e267c6d50f1cff1 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.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.xsd" />
<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef.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/CDT-svcFwWrapper.xsd b/CDT-svcFwWrapper.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..2a69e9d36b5ffcebf079d2163d3b84c9a60cfb59
--- /dev/null
+++ b/CDT-svcFwWrapper.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.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/CDT-svcObjWrapper.xsd b/CDT-svcObjWrapper.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..fbf53f0982987b0975e13973028db4ec9990f4dc
--- /dev/null
+++ b/CDT-svcObjWrapper.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.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp.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/CDT-timeSeries.xsd b/CDT-timeSeries.xsd
index 769780aa5fc9d617b80e5eb64ecdbefc350f07ef..c36eb43d270375cd4c715d02c2e5431373087a74 100644
--- a/CDT-timeSeries.xsd
+++ b/CDT-timeSeries.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.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/CDT-timeSeriesInstance.xsd b/CDT-timeSeriesInstance.xsd
index 7c711497dee4b96934645aaac3c2674e51fdf616..75b973d5fc5ccc2e33999e629142f2f469f5c436 100644
--- a/CDT-timeSeriesInstance.xsd
+++ b/CDT-timeSeriesInstance.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.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/CDT-token.xsd b/CDT-token.xsd
index 9210df22cc5bb741b76485a533f98bfb3f01a79e..bc09fd599688b052c3d37639c35bae3cce488f81 100644
--- a/CDT-token.xsd
+++ b/CDT-token.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.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/CDT-trafficPattern.xsd b/CDT-trafficPattern.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..d9a7282ad8fabddfbdccadba8713cb7cd1356ce0
--- /dev/null
+++ b/CDT-trafficPattern.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.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-schedule.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>